diff --git a/src/logger.js b/src/logger.js
index a7bf9e1ae..7ce4d9a3f 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -1,54 +1,18 @@
-/**
- * #logger
- * logger = require('logger').create()
- * logger.info("blah")
- * => [2011-3-3T20:24:4.810 info (5021)] blah
- * logger.debug("boom")
- * =>
- * logger.level = Logger.levels.debug
- * logger.debug(function() { return "booom" })
- * => [2011-3-3T20:24:4.810 error (5021)] booom
- */
+import moment from 'moment'
 
-function formatTime (timestamp) {
-  var hh = timestamp.getUTCHours()
-  var mm = timestamp.getUTCMinutes()
-  var ss = timestamp.getSeconds()
-  var ms = timestamp.getMilliseconds()
-  // If you were building a timestamp instead of a duration, you would uncomment the following line to get 12-hour (not 24) time
-  // if (hh > 12) {hh = hh % 12;}
-  // These lines ensure you have two-digits
-  if (hh < 10) {
-    hh = '0' + hh
-  }
-  if (mm < 10) {
-    mm = '0' + mm
-  }
-  if (ss < 10) {
-    ss = '0' + ss
-  }
-  if (ms < 100) {
-    ms = '0' + ms
-  }
-  if (ms < 10) {
-    ms = '00' + ms
-  }
-  // This formats your string to HH:MM:SS
-  var t = hh + ':' + mm + ':' + ss + ' (' + ms + ')'
-  return t
+const format = (level) => {
+  const time = moment().format('HH:mm:ss (SSS)')
+  return `%c ${time} :%c${level}: `
 }
 
-function format (level) {
-  const time = formatTime(new Date())
-  return '%c ' + time + ' :%c' + level + ': '
+export const Log = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+  fatal: () => {}
 }
 
-var debug = function () { }
-var info = function () { }
-var warn = function () { }
-var error = function () { }
-var fatal = function () { }
-
 /**
  * logLevel , decides the amount of logging to be used.
  *    * debug: 1
@@ -57,28 +21,20 @@ var fatal = function () { }
  *    * error: 4
  *    * fatal: 5
  */
-exports.setLogLevel = function (level) {
+export const setLogLevel = function (level) {
   if (level < 6) {
-    exports.Log.fatal = console.log.bind(console, format('FATAL'), 'color:grey;', 'color: red;')
+    Log.fatal = console.log.bind(console, format('FATAL'), 'color:grey;', 'color: red;')
   }
   if (level < 5) {
-    exports.Log.error = console.log.bind(console, format('ERROR'), 'color:grey;', 'color: red;')
+    Log.error = console.log.bind(console, format('ERROR'), 'color:grey;', 'color: red;')
   }
   if (level < 4) {
-    exports.Log.warn = console.log.bind(console, format('WARN'), 'color:grey;', 'color: orange;')
+    Log.warn = console.log.bind(console, format('WARN'), 'color:grey;', 'color: orange;')
   }
   if (level < 3) {
-    exports.Log.info = console.log.bind(console, format('INFO'), 'color:grey;', 'color: info;')
+    Log.info = console.log.bind(console, format('INFO'), 'color:grey;', 'color: info;')
   }
   if (level < 2) {
-    exports.Log.debug = console.log.bind(console, format('DEBUG'), 'color:grey;', 'color: green;')
+    Log.debug = console.log.bind(console, format('DEBUG'), 'color:grey;', 'color: green;')
   }
 }
-
-exports.Log = {
-  debug: debug,
-  info: info,
-  warn: warn,
-  error: error,
-  fatal: fatal
-}