diff --git a/packages/unleash-api/lib/db/feature.js b/packages/unleash-api/lib/db/feature.js
index 2de1185ca9..62db7446a2 100644
--- a/packages/unleash-api/lib/db/feature.js
+++ b/packages/unleash-api/lib/db/feature.js
@@ -1,7 +1,7 @@
 'use strict';
-const eventType       = require('../eventType');
-const logger          = require('../logger');
-const NotFoundError   = require('../error/NotFoundError');
+const eventType = require('../eventType');
+const logger = require('../logger');
+const NotFoundError = require('../error/NotFoundError');
 const FEATURE_COLUMNS = ['name', 'description', 'enabled', 'strategy_name', 'parameters'];
 
 module.exports = function(db, eventStore) {
diff --git a/packages/unleash-api/lib/db/strategy.js b/packages/unleash-api/lib/db/strategy.js
index 5fafe7fd6e..054d5d08da 100644
--- a/packages/unleash-api/lib/db/strategy.js
+++ b/packages/unleash-api/lib/db/strategy.js
@@ -1,7 +1,7 @@
 'use strict';
-const eventType       = require('../eventType');
-const logger          = require('../logger');
-const NotFoundError   = require('../error/NotFoundError');
+const eventType = require('../eventType');
+const logger = require('../logger');
+const NotFoundError = require('../error/NotFoundError');
 const STRATEGY_COLUMNS = ['name', 'description', 'parameters_template'];
 
 module.exports = function(db, eventStore) {
diff --git a/packages/unleash-api/lib/eventDiffer.js b/packages/unleash-api/lib/eventDiffer.js
index e3980aecdb..a6fc614066 100644
--- a/packages/unleash-api/lib/eventDiffer.js
+++ b/packages/unleash-api/lib/eventDiffer.js
@@ -1,6 +1,6 @@
 'use strict';
-const eventType     = require('./eventType');
-const diff          = require('deep-diff').diff;
+const eventType = require('./eventType');
+const diff = require('deep-diff').diff;
 
 const strategyTypes = [
     eventType.strategyCreated,
diff --git a/packages/unleash-api/lib/routes/feature-archive.js b/packages/unleash-api/lib/routes/feature-archive.js
index 33cc47e1f0..fd476a3757 100644
--- a/packages/unleash-api/lib/routes/feature-archive.js
+++ b/packages/unleash-api/lib/routes/feature-archive.js
@@ -1,8 +1,8 @@
 'use strict';
-const logger              = require('../logger');
-const eventType           = require('../eventType');
-const ValidationError     = require('../error/ValidationError');
-const validateRequest     = require('../error/validateRequest');
+const logger = require('../logger');
+const eventType = require('../eventType');
+const ValidationError = require('../error/ValidationError');
+const validateRequest = require('../error/validateRequest');
 
 module.exports = function (app, config) {
     const featureDb = config.featureDb;
diff --git a/packages/unleash-api/lib/routes/feature.js b/packages/unleash-api/lib/routes/feature.js
index 508aa5fc53..b1e0409a21 100644
--- a/packages/unleash-api/lib/routes/feature.js
+++ b/packages/unleash-api/lib/routes/feature.js
@@ -1,12 +1,12 @@
 'use strict';
-const Promise             = require('bluebird');
-const logger              = require('../logger');
-const eventType           = require('../eventType');
-const NameExistsError     = require('../error/NameExistsError');
-const NotFoundError       = require('../error/NotFoundError');
-const ValidationError     = require('../error/ValidationError');
-const validateRequest     = require('../error/validateRequest');
-const extractUser         = require('../extractUser');
+const Promise = require('bluebird');
+const logger = require('../logger');
+const eventType = require('../eventType');
+const NameExistsError = require('../error/NameExistsError');
+const NotFoundError = require('../error/NotFoundError');
+const ValidationError = require('../error/ValidationError');
+const validateRequest = require('../error/validateRequest');
+const extractUser = require('../extractUser');
 
 module.exports = function (app, config) {
     const featureDb = config.featureDb;
diff --git a/packages/unleash-api/lib/routes/index.js b/packages/unleash-api/lib/routes/index.js
index 4cd145ada6..49e7bc73cc 100644
--- a/packages/unleash-api/lib/routes/index.js
+++ b/packages/unleash-api/lib/routes/index.js
@@ -1,7 +1,3 @@
-/**
- * TODO: we should also inject config and
- * services to the routes to ease testing.
-**/
 'use strict';
 
 exports.create = function (app, config) {
diff --git a/packages/unleash-api/lib/routes/strategy.js b/packages/unleash-api/lib/routes/strategy.js
index ec9abd5b0b..4545f0912b 100644
--- a/packages/unleash-api/lib/routes/strategy.js
+++ b/packages/unleash-api/lib/routes/strategy.js
@@ -1,12 +1,12 @@
 'use strict';
-const Promise             = require('bluebird');
-const eventType           = require('../eventType');
-const logger              = require('../logger');
-const NameExistsError     = require('../error/NameExistsError');
-const ValidationError     = require('../error/ValidationError');
-const NotFoundError       = require('../error/NotFoundError');
-const validateRequest     = require('../error/validateRequest');
-const extractUser         = require('../extractUser');
+const Promise = require('bluebird');
+const eventType = require('../eventType');
+const logger = require('../logger');
+const NameExistsError = require('../error/NameExistsError');
+const ValidationError = require('../error/ValidationError');
+const NotFoundError = require('../error/NotFoundError');
+const validateRequest = require('../error/validateRequest');
+const extractUser = require('../extractUser');
 
 module.exports = function (app, config) {
     const strategyDb = config.strategyDb;