diff --git a/source/server/module.js b/source/server/module.js
index 41d5e9e..f1fac39 100644
--- a/source/server/module.js
+++ b/source/server/module.js
@@ -1,27 +1,27 @@
- Space.Module.define('Space.logging.Winston', {
+Space.Module.define('Space.logging.Winston', {
 
   dependencies: {
     configuration: 'configuration',
-    log: 'Space.Logger',
+    log: 'Space.Logger'
   },
 
   onInitialize() {
-    let log = this.injector.get('log');
+    const log = this.injector.get('log');
 
-    let transports = lodash.get(this.configuration, 'log.winston.transports', [
+    const transports = lodash.get(this.configuration, 'log.winston.transports', [
       this._setupWinstonConsoleTransport()
-    ])
-    let adapter = new Space.Logger.WinstonAdapter(transports);
+    ]);
+    const adapter = new Space.Logger.WinstonAdapter(transports);
     this.injector.map('Space.Logger.WinstonAdapter').toStaticValue(adapter);
     log.addAdapter('winston', adapter);
   },
 
-  _setupWinstonConsoleTransport() {
-    options = {
+  _setupWinstonConsoleTransport(options) {
+    const mergedOptions = _.extend({}, {
       colorize: true,
       prettyPrint: true,
-      level: 'info',
-    }
-    return Space.Logger.WinstonAdapter.console(options);
+      level: 'info'
+    }, options);
+    return Space.Logger.WinstonAdapter.console(mergedOptions);
   }
-});
\ No newline at end of file
+});
diff --git a/source/server/winston-adapter.js b/source/server/winston-adapter.js
index 4b3ed54..5f88bc5 100644
--- a/source/server/winston-adapter.js
+++ b/source/server/winston-adapter.js
@@ -3,7 +3,7 @@ const winston = Npm.require('winston');
 const WinstonAdapter = Space.Logger.Adapter.extend('Space.Logger.WinstonAdapter', {
 
   Constructor(transports) {
-    let lib = new winston.Logger({
+    const lib = new winston.Logger({
       transports: transports || []
     });
     lib.setLevels(winston.config.syslog.levels);
@@ -18,15 +18,15 @@ const WinstonAdapter = Space.Logger.Adapter.extend('Space.Logger.WinstonAdapter'
     return this._lib.remove.apply(this._lib, arguments);
   },
 
-  hasTransport(name) {
-    return this._lib.transports[transportName] != null;
+  hasTransport(transportName) {
+    return this._lib.transports[transportName] !== null;
   },
 
   setLevel(transportName, levelName) {
     if (!this.hasTransport(transportName)) {
       throw new Error(this.ERRORS.transportNotAdded(transportName));
     }
-    return this._lib.transports[transportName].level = levelName;
+    this._lib.transports[transportName].level = levelName;
   },
 
   ERRORS: {
@@ -36,13 +36,11 @@ const WinstonAdapter = Space.Logger.Adapter.extend('Space.Logger.WinstonAdapter'
   }
 });
 
-WinstonAdapter.console = function(options) {
-  if (options == null) {
-    let options = {
-      colorize: true,
-      prettyPrint: true,
-      level: 'info'
-    };
-  }
-  return new winston.transports.Console(options);
+WinstonAdapter.console = (options) => {
+  const mergedOptions = _.extend({}, {
+    colorize: true,
+    prettyPrint: true,
+    level: 'info'
+  }, options);
+  return new winston.transports.Console(mergedOptions);
 };