diff --git a/.jshintrc b/.jshintrc
index f18a4487..e9dc9b2e 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -4,7 +4,7 @@
   "freeze": true,
   "immed": true,
   "latedef": "nofunc",
-  "newcap": true,
+  "newcap": false,
   "noarg": true,
   "noempty": true,
   "nonbsp": true,
@@ -24,6 +24,7 @@
     "beforeEach": false,
     "after": false,
     "afterEach": false,
+    "expect": true,
     "inject": false,
     "angular": false
   }
diff --git a/res/app/components/stf/common-ui/clear-button/clear-button-spec.js b/res/app/components/stf/common-ui/clear-button/clear-button-spec.js
index 0ca3aaa8..f918d89f 100644
--- a/res/app/components/stf/common-ui/clear-button/clear-button-spec.js
+++ b/res/app/components/stf/common-ui/clear-button/clear-button-spec.js
@@ -11,13 +11,13 @@ describe('clearButton', function () {
 
   it('should ...', function () {
 
-    /* 
-     To test your directive, you need to create some html that would use your directive,
-     send that through compile() then compare the results.
+    /*
+     To test your directive, you need to create some html that would use your
+     directive, send that through compile() then compare the results.
 
      var element = compile('<div clear-button name="name">hi</div>')(scope);
      expect(element.text()).toBe('hello, world');
      */
 
   });
-});
\ No newline at end of file
+});
diff --git a/res/app/components/stf/common-ui/filter-button/filter-button-spec.js b/res/app/components/stf/common-ui/filter-button/filter-button-spec.js
index f3214f5a..9b8e749b 100644
--- a/res/app/components/stf/common-ui/filter-button/filter-button-spec.js
+++ b/res/app/components/stf/common-ui/filter-button/filter-button-spec.js
@@ -11,13 +11,13 @@ describe('filterButton', function () {
 
   it('should ...', function () {
 
-    /* 
-     To test your directive, you need to create some html that would use your directive,
-     send that through compile() then compare the results.
+    /*
+     To test your directive, you need to create some html that would use your
+     directive, send that through compile() then compare the results.
 
      var element = compile('<div clear-button name="name">hi</div>')(scope);
      expect(element.text()).toBe('hello, world');
      */
 
   });
-});
\ No newline at end of file
+});
diff --git a/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js b/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
index 89dde1d6..67c88228 100644
--- a/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
+++ b/res/app/components/stf/common-ui/refresh-page/refresh-page-directive.js
@@ -5,7 +5,7 @@ module.exports = function refreshPageDirective() {
     scope: {
     },
     template: require('./refresh-page.jade'),
-    link: function (scope, element, attrs) {
+    link: function () {
       // TODO: reload with $route.reload()
     }
   }
diff --git a/res/app/components/stf/common-ui/refresh-page/refresh-page-spec.js b/res/app/components/stf/common-ui/refresh-page/refresh-page-spec.js
index 7dd808d4..cc1ee032 100644
--- a/res/app/components/stf/common-ui/refresh-page/refresh-page-spec.js
+++ b/res/app/components/stf/common-ui/refresh-page/refresh-page-spec.js
@@ -11,13 +11,13 @@ describe('refreshPage', function () {
 
   it('should ...', function () {
 
-    /* 
-     To test your directive, you need to create some html that would use your directive,
-     send that through compile() then compare the results.
+    /*
+     To test your directive, you need to create some html that would use your
+     directive, send that through compile() then compare the results.
 
      var element = compile('<div refresh-page name="name">hi</div>')(scope);
      expect(element.text()).toBe('hello, world');
      */
 
   });
-});
\ No newline at end of file
+});
diff --git a/res/app/components/stf/control/control-service.js b/res/app/components/stf/control/control-service.js
index e264eeca..2e9051d0 100644
--- a/res/app/components/stf/control/control-service.js
+++ b/res/app/components/stf/control/control-service.js
@@ -1,4 +1,9 @@
-module.exports = function ControlServiceFactory($rootScope, $upload, socket, TransactionService) {
+module.exports = function ControlServiceFactory(
+  $rootScope
+, $upload
+, socket
+, TransactionService
+) {
   var controlService = {
   }
 
diff --git a/res/app/components/stf/device/device-service.js b/res/app/components/stf/device/device-service.js
index b78fc231..52a63ec9 100644
--- a/res/app/components/stf/device/device-service.js
+++ b/res/app/components/stf/device/device-service.js
@@ -1,6 +1,5 @@
 var oboe = require('oboe')
 var _ = require('lodash')
-var Promise = require('bluebird')
 
 module.exports = function DeviceServiceFactory($rootScope, $http, socket) {
   var deviceService = {}
diff --git a/res/app/components/stf/nav-menu/nav-menu-directive.js b/res/app/components/stf/nav-menu/nav-menu-directive.js
index 4e1d4727..9284e307 100644
--- a/res/app/components/stf/nav-menu/nav-menu-directive.js
+++ b/res/app/components/stf/nav-menu/nav-menu-directive.js
@@ -1,12 +1,11 @@
-// Based from https://ryankaskel.com/blog/2013/05/27/a-different-approach-to-angularjs-navigation-menus
-
+/* Based on https://ryankaskel.com/blog/2013/05/27/
+    a-different-approach-to-angularjs-navigation-menus */
 
 module.exports = function ($location) {
   return function (scope, element, attrs) {
     var links = element.find('a')
     var onClass = attrs.navMenu || 'current'
     var routePattern
-    var routeBasePattern = /\/#[^/]*/ // TODO: add regex to remove last part of the url
     var link
     var url
     var currentLink
@@ -50,4 +49,4 @@ module.exports = function ($location) {
     activateLink()
     scope.$on('$routeChangeStart', activateLink)
   }
-}
\ No newline at end of file
+}
diff --git a/res/app/components/stf/nav-menu/nav-menu-spec.js b/res/app/components/stf/nav-menu/nav-menu-spec.js
index 1125ee1f..59a0c133 100644
--- a/res/app/components/stf/nav-menu/nav-menu-spec.js
+++ b/res/app/components/stf/nav-menu/nav-menu-spec.js
@@ -11,13 +11,13 @@ describe('navMenu', function () {
 
   it('should ...', function () {
 
-    /* 
-     To test your directive, you need to create some html that would use your directive,
-     send that through compile() then compare the results.
+    /*
+     To test your directive, you need to create some html that would use your
+     directive, send that through compile() then compare the results.
 
      var element = compile('<div nav-menu name="name">hi</div>')(scope);
      expect(element.text()).toBe('hello, world');
      */
 
   });
-});
\ No newline at end of file
+});
diff --git a/res/app/components/stf/page-visibility/page-visibility-directive.js b/res/app/components/stf/page-visibility/page-visibility-directive.js
index 5703fad1..36572524 100644
--- a/res/app/components/stf/page-visibility/page-visibility-directive.js
+++ b/res/app/components/stf/page-visibility/page-visibility-directive.js
@@ -1,19 +1,22 @@
 module.exports = function pageVisibilityDirective($document, $rootScope) {
   return {
     restrict: 'A',
-    link: function (scope, element, attrs) {
-
+    link: function (scope) {
       function pageVisibilityChanged() {
         if (document.hidden) {
           $rootScope.$broadcast('pageHidden')
         } else {
-          $rootScope.$broadcast('pageVisible');
+          $rootScope.$broadcast('pageVisible')
           // Application is visible to the user
           // Adjust polling rates and display update for active display mode
         }
       }
 
-      document.addEventListener('visibilitychange', pageVisibilityChanged, false)
+      document.addEventListener(
+        'visibilitychange'
+      , pageVisibilityChanged
+      , false
+      )
 
       scope.$on('$destroy', function () {
         angular.element(document).unbind('visibilitychange');
diff --git a/res/app/components/stf/page-visibility/page-visibility-spec.js b/res/app/components/stf/page-visibility/page-visibility-spec.js
index f01d170c..9a431915 100644
--- a/res/app/components/stf/page-visibility/page-visibility-spec.js
+++ b/res/app/components/stf/page-visibility/page-visibility-spec.js
@@ -11,13 +11,13 @@ describe('pageVisibility', function () {
 
   it('should ...', function () {
 
-    /* 
-     To test your directive, you need to create some html that would use your directive,
-     send that through compile() then compare the results.
+    /*
+     To test your directive, you need to create some html that would use your
+     directive, send that through compile() then compare the results.
 
      var element = compile('<div page-visibility name="name">hi</div>')(scope);
      expect(element.text()).toBe('hello, world');
      */
 
   });
-});
\ No newline at end of file
+});
diff --git a/res/app/components/stf/screen/fast-image-render/index.js b/res/app/components/stf/screen/fast-image-render/index.js
index 7d3e6ae0..57a71479 100644
--- a/res/app/components/stf/screen/fast-image-render/index.js
+++ b/res/app/components/stf/screen/fast-image-render/index.js
@@ -7,19 +7,6 @@
 
 
 function CanvasRender(canvasElement, options) {
-  var checkForCanvasElement = function checkForCanvasElement() {
-    if (!canvasElement) {
-      throw new Error('Needs a canvas element')
-    }
-
-    this.displayWidth = canvasElement.offsetWidth
-    this.displayHeight = canvasElement.offsetHeight
-
-    if (!this.displayWidth || !this.displayHeight) {
-      throw new Error('Unable to get display size canvas must have dimensions')
-    }
-  }
-
   this.options = options
   this.context = canvasElement.getContext('2d')
 }
@@ -35,7 +22,9 @@ CanvasRender.prototype.clear = function () {
 
 // -------------------------------------------------------------------------------------------------
 
-// Based on http://www-cs-students.stanford.edu/~eparker/files/crunch/renderer.js
+/*
+Based on http://www-cs-students.stanford.edu/~eparker/files/crunch/renderer.js
+*/
 
 /**
  * Constructs a renderer object.
@@ -114,13 +103,15 @@ var Renderer = function (gl) {
   var count = gl.getProgramParameter(this.program_, gl.ACTIVE_UNIFORMS);
   for (var i = 0; i < /** @type {number} */(count); i++) {
     var infoU = gl.getActiveUniform(this.program_, i);
-    this.uniformLocations_[infoU.name] = gl.getUniformLocation(this.program_, infoU.name);
+    this.uniformLocations_[infoU.name] =
+      gl.getUniformLocation(this.program_, infoU.name);
   }
 
   count = gl.getProgramParameter(this.program_, gl.ACTIVE_ATTRIBUTES);
   for (var j = 0; j < /** @type {number} */(count); j++) {
     var infoA = gl.getActiveAttrib(this.program_, j);
-    this.attribLocations_[infoA.name] = gl.getAttribLocation(this.program_, infoA.name);
+    this.attribLocations_[infoA.name] =
+      gl.getAttribLocation(this.program_, infoA.name);
   }
 };
 
@@ -130,7 +121,12 @@ Renderer.prototype.finishInit = function () {
 };
 
 
-Renderer.prototype.createDxtTexture = function (dxtData, width, height, format) {
+Renderer.prototype.createDxtTexture = function (
+  dxtData
+, width
+, height
+, format
+) {
   var gl = this.gl_;
   var tex = gl.createTexture();
   gl.bindTexture(gl.TEXTURE_2D, tex);
@@ -242,20 +238,7 @@ Renderer.fragmentShaderSource_ = [
 // -------------------------------------------------------------------------------------------------
 
 
-function WebGLRender(canvasElement, options) {
-  var checkForCanvasElement = function checkForCanvasElement() {
-    if (!canvasElement) {
-      throw new Error('Needs a canvas element')
-    }
-
-    this.displayWidth = canvasElement.offsetWidth
-    this.displayHeight = canvasElement.offsetHeight
-
-    if (!this.displayWidth || !this.displayHeight) {
-      throw new Error('Unable to get display size canvas must have dimensions')
-    }
-  }
-
+function WebGLRender(canvasElement) {
   this.options = {
 //    alpha: this.transparent,
 //    antialias: !!antialias,
@@ -270,7 +253,8 @@ function WebGLRender(canvasElement, options) {
       this.ctx = canvasElement.getContext('webgl', this.options)
     } catch (e2) {
       // fail, not able to get a context
-      throw new Error('This browser does not support webGL. Try using the canvas renderer' + this)
+      throw new Error('This browser does not support webGL. Try using the' +
+        'canvas renderer' + this)
     }
   }
 
@@ -332,9 +316,19 @@ WebGLRender.prototype.setup = function () {
   this.vertexBuff = this.ctx.createBuffer()
   this.ctx.bindBuffer(this.ctx.ARRAY_BUFFER, this.vertexBuff)
   this.ctx.bufferData(
-    this.ctx.ARRAY_BUFFER,
-    new Float32Array([-1 / 8, 1 / 6, -1 / 8, -1 / 6, 1 / 8, -1 / 6, 1 / 8, 1 / 6]),
-    this.ctx.STATIC_DRAW)
+    this.ctx.ARRAY_BUFFER
+  , new Float32Array([
+      -1 / 8
+    , 1 / 6
+    , -1 / 8
+    , -1 / 6
+    , 1 / 8
+    , -1 / 6
+    , 1 / 8
+    , 1 / 6
+    ])
+  , this.ctx.STATIC_DRAW
+  )
 
   this.texBuff = this.ctx.createBuffer()
   this.ctx.bindBuffer(this.ctx.ARRAY_BUFFER, this.texBuff)
@@ -358,15 +352,43 @@ WebGLRender.prototype.draw = function (image) {
 WebGLRender.prototype.drawOld = function (image) {
   var tex = this.ctx.createTexture()
   this.ctx.bindTexture(this.ctx.TEXTURE_2D, tex)
-  this.ctx.texParameteri(this.ctx.TEXTURE_2D, this.ctx.TEXTURE_MIN_FILTER, this.ctx.NEAREST)
-  this.ctx.texParameteri(this.ctx.TEXTURE_2D, this.ctx.TEXTURE_MAG_FILTER, this.ctx.NEAREST)
-//  this.ctx.texParameteri(this.ctx.TEXTURE_2D, this.ctx.TEXTURE_MIN_FILTER, this.ctx.LINEAR);
-
-//  this.ctx.texParameteri(this.ctx.TEXTURE_2D, this.ctx.TEXTURE_WRAP_S, this.ctx.CLAMP_TO_EDGE);
-//  this.ctx.texParameteri(this.ctx.TEXTURE_2D, this.ctx.TEXTURE_WRAP_T, this.ctx.CLAMP_TO_EDGE);
+  this.ctx.texParameteri(
+    this.ctx.TEXTURE_2D
+  , this.ctx.TEXTURE_MIN_FILTER
+  , this.ctx.NEAREST
+  )
+  this.ctx.texParameteri(
+    this.ctx.TEXTURE_2D
+  , this.ctx.TEXTURE_MAG_FILTER
+  , this.ctx.NEAREST
+  )
+/*
+  this.ctx.texParameteri(
+    this.ctx.TEXTURE_2D
+  , this.ctx.TEXTURE_MIN_FILTER
+  , this.ctx.LINEAR
+  )
 
+  this.ctx.texParameteri(
+    this.ctx.TEXTURE_2D
+  , this.ctx.TEXTURE_WRAP_S
+  , this.ctx.CLAMP_TO_EDGE
+  )
+  this.ctx.texParameteri(
+    this.ctx.TEXTURE_2D
+  , this.ctx.TEXTURE_WRAP_T
+  , this.ctx.CLAMP_TO_EDGE
+  )
+*/
   this.ctx.generateMipmap(this.ctx.TEXTURE_2D)
-  this.ctx.texImage2D(this.ctx.TEXTURE_2D, 0, this.ctx.RGBA, this.ctx.RGBA, this.ctx.UNSIGNED_BYTE, image)
+  this.ctx.texImage2D(
+    this.ctx.TEXTURE_2D
+  , 0
+  , this.ctx.RGBA
+  , this.ctx.RGBA
+  , this.ctx.UNSIGNED_BYTE
+  , image
+  )
 
   this.ctx.enableVertexAttribArray(this.vloc)
   this.ctx.bindBuffer(this.ctx.ARRAY_BUFFER, this.vertexBuff)
@@ -440,7 +462,7 @@ FastImageRender.prototype.load = function (url, type) {
     var texture = null
     if (type) {
       texture = this.render.ctx.createTexture();
-      this.textureLoader.loadEx(url, texture, true, function (tex) {
+      this.textureLoader.loadEx(url, texture, true, function () {
         if (typeof(that.onLoad) === 'function') {
           that.onLoad(texture)
         }
diff --git a/res/app/components/stf/screen/fast-image-render/test/performance_test.js b/res/app/components/stf/screen/fast-image-render/test/performance_test.js
index 1ede5406..ebba7712 100644
--- a/res/app/components/stf/screen/fast-image-render/test/performance_test.js
+++ b/res/app/components/stf/screen/fast-image-render/test/performance_test.js
@@ -7,14 +7,22 @@ var frame = {
   current: 0
 }
 
-var imageRender = new FastImageRender(canvasElement, {render: 'canvas', textureLoader: false})
+var imageRender = new FastImageRender(
+  canvasElement
+, {
+    render: 'canvas'
+  , textureLoader: false
+  }
+)
 
 function loadNext() {
   console.time('load')
 //  var width = 300
 //  var height = 300
-  //  loader.src = 'http://placehold.it/' + width + 'x' + height + '?' + Date.now()
-  //  loader.src = 'http://lorempixel.com/' + width + '/' + height + '/abstract/Frame-' + frames.current + '/?' + Date.now()
+  //  loader.src = 'http://placehold.it/' + width + 'x' + height + '?' +
+  //    Date.now()
+  //  loader.src = 'http://lorempixel.com/' + width + '/' + height +
+  //    '/abstract/Frame-' + frames.current + '/?' + Date.now()
   imageRender.load('images/screen.jpg?' + Date.now())
 //  imageRender.load('images/screen.jpg')
 }
@@ -39,4 +47,3 @@ imageRender.onLoad = function (image) {
     totalTimeElement.innerHTML = totalTime / 1000 + ' seconds'
   }
 }
-
diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js
index a09752da..f18b3a91 100644
--- a/res/app/components/stf/screen/screen-directive.js
+++ b/res/app/components/stf/screen/screen-directive.js
@@ -4,7 +4,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService) {
   return {
     restrict: 'E',
     template: require('./screen.jade'),
-    link: function (scope, element, attrs) {
+    link: function (scope, element) {
       var canvas = element.find('canvas')[0]
         , imageRender = new FastImageRender(canvas, {render: 'canvas'})
         , finger = element.find('span')
diff --git a/res/app/components/stf/user/group/group-service.js b/res/app/components/stf/user/group/group-service.js
index 116d741a..83ac334b 100644
--- a/res/app/components/stf/user/group/group-service.js
+++ b/res/app/components/stf/user/group/group-service.js
@@ -1,42 +1,39 @@
-var _ = require('lodash')
-
-module.exports = function GroupServiceFactory(socket, UserService, TransactionService) {
+module.exports = function GroupServiceFactory(
+  socket
+, TransactionService
+) {
   var groupService = {
   }
 
   groupService.invite = function (device) {
-    return UserService.user().then(function (user) {
-      var tx = TransactionService.create([device])
-      socket.emit('group.invite', device.channel, tx.channel, {
-        serial: {
-          value: device.serial
-        , match: 'exact'
-        }
-      })
-      return tx.promise.then(function(results) {
-        if (!results[0].success) {
-          throw new Error('Device refused to join the group')
-        }
-        return results[0].device
-      })
+    var tx = TransactionService.create([device])
+    socket.emit('group.invite', device.channel, tx.channel, {
+      serial: {
+        value: device.serial
+      , match: 'exact'
+      }
+    })
+    return tx.promise.then(function(results) {
+      if (!results[0].success) {
+        throw new Error('Device refused to join the group')
+      }
+      return results[0].device
     })
   }
 
   groupService.kick = function (device) {
-    return UserService.user().then(function (user) {
-      var tx = TransactionService.create([device])
-      socket.emit('group.kick', device.channel, tx.channel, {
-        serial: {
-          value: device.serial
-        , match: 'exact'
-        }
-      })
-      return tx.promise.then(function(results) {
-        if (!results[0].success) {
-          throw new Error('Device refused to be kicked from the group')
-        }
-        return results[0].device
-      })
+    var tx = TransactionService.create([device])
+    socket.emit('group.kick', device.channel, tx.channel, {
+      serial: {
+        value: device.serial
+      , match: 'exact'
+      }
+    })
+    return tx.promise.then(function(results) {
+      if (!results[0].success) {
+        throw new Error('Device refused to be kicked from the group')
+      }
+      return results[0].device
     })
   }
 
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index 0365bd92..df662550 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -1,3 +1,3 @@
-module.exports = function($scope) {
-    
-}
\ No newline at end of file
+module.exports = function ControlPanesCtrl() {
+
+}
diff --git a/res/app/device-control/device-control-controller.js b/res/app/device-control/device-control-controller.js
index 31c631f9..1005e9cf 100644
--- a/res/app/device-control/device-control-controller.js
+++ b/res/app/device-control/device-control-controller.js
@@ -1,4 +1,11 @@
-module.exports = function DeviceControlCtrl($scope, $routeParams, $location, DeviceService, GroupService, ControlService) {
+module.exports = function DeviceControlCtrl(
+  $scope
+, $routeParams
+, $location
+, DeviceService
+, GroupService
+, ControlService
+) {
   $scope.control = null
   $scope.device = null
   $scope.control = null
@@ -12,7 +19,7 @@ module.exports = function DeviceControlCtrl($scope, $routeParams, $location, Dev
       $scope.control = ControlService.forOne(device, device.channel)
       return device
     })
-    .catch(function(err) {
+    .catch(function() {
       $location.path('/')
     })
 }
diff --git a/res/app/layout/layout-controller.js b/res/app/layout/layout-controller.js
index d851cc97..b70204ce 100644
--- a/res/app/layout/layout-controller.js
+++ b/res/app/layout/layout-controller.js
@@ -1,2 +1,2 @@
-module.exports = function LayoutCtrl($scope) {
+module.exports = function LayoutCtrl() {
 }
diff --git a/res/app/menu/menu-controller.js b/res/app/menu/menu-controller.js
index 62a5c844..730cfe27 100644
--- a/res/app/menu/menu-controller.js
+++ b/res/app/menu/menu-controller.js
@@ -1,3 +1,3 @@
-module.exports = function MenuCtrl($scope) {
+module.exports = function MenuCtrl() {
 
 }
diff --git a/res/app/settings/language/index.js b/res/app/settings/language/index.js
index b94eebf0..313594a6 100644
--- a/res/app/settings/language/index.js
+++ b/res/app/settings/language/index.js
@@ -2,7 +2,10 @@ module.exports = angular.module('stf-ui-language', [
   require('stf/settings').name
 ])
   .run(["$templateCache", function($templateCache) {
-    $templateCache.put('settings/language/language.jade', require('./language.jade'))
+    $templateCache.put(
+      'settings/language/language.jade'
+    , require('./language.jade')
+    )
   }])
   .factory('LanguageService', require('./language-service'))
   .controller('LanguageCtrl', require('./language-controller'))
diff --git a/res/app/settings/language/language-service.js b/res/app/settings/language/language-service.js
index 535bfb13..5bc0a27a 100644
--- a/res/app/settings/language/language-service.js
+++ b/res/app/settings/language/language-service.js
@@ -1,6 +1,10 @@
 var _ = require('lodash')
 
-module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCatalog) {
+module.exports = function LanguageServiceFactory(
+  SettingsService
+, $q
+, gettextCatalog
+) {
   var LanguageService = {}
 
   LanguageService.supportedLanguages = [
@@ -10,7 +14,10 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
 
   var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
   var browserLanguage = browserLocale.substring(0, 2)
-  var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
+  var detectedLanguage =
+    _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ?
+      browserLanguage :
+      'en'
   var defaultLanguage = 'ja'
   LanguageService.detectedLanguage = defaultLanguage
   LanguageService.selectedLanguage = null
@@ -29,9 +36,10 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
         if (data) {
           deferred.resolve(data)
         } else {
-          LanguageService.setSelectedLanguage(LanguageService.detectedLanguage).then(function () {
-            deferred.resolve(LanguageService.detectedLanguage)
-          })
+          LanguageService.setSelectedLanguage(LanguageService.detectedLanguage)
+            .then(function () {
+              deferred.resolve(LanguageService.detectedLanguage)
+            })
         }
       })
     }
diff --git a/res/app/settings/local/index.js b/res/app/settings/local/index.js
index 552aed46..4d2d3392 100644
--- a/res/app/settings/local/index.js
+++ b/res/app/settings/local/index.js
@@ -8,6 +8,9 @@ module.exports = angular.module('ui-local-settings', [
   //'dialogs'
 ])
   .run(["$templateCache", function ($templateCache) {
-    $templateCache.put('settings/local/local-settings.jade', require('./local-settings.jade'))
+    $templateCache.put(
+      'settings/local/local-settings.jade'
+    , require('./local-settings.jade')
+    )
   }])
   .controller('LocalSettingsCtrl', require('./local-settings-controller'))
diff --git a/res/app/settings/local/local-settings-controller.js b/res/app/settings/local/local-settings-controller.js
index 528083e7..a87c16f7 100644
--- a/res/app/settings/local/local-settings-controller.js
+++ b/res/app/settings/local/local-settings-controller.js
@@ -8,7 +8,8 @@ module.exports = function ($scope, SettingsService) {
 
 //  $scope.resetSettings = function () {
 //    var title = 'Reset Settings';
-//    var msg = 'Are you sure you want to revert all settings to their default values?';
+//    var msg = 'Are you sure you want to revert all settings to ' +
+//      'their default values?';
 //    var btns = [
 //      {result: 'cancel', label: 'Cancel'},
 //      {result: 'ok', label: 'OK', cssClass: 'btn-primary'}
diff --git a/res/app/settings/notifications/index.js b/res/app/settings/notifications/index.js
index 6840b701..0e820678 100644
--- a/res/app/settings/notifications/index.js
+++ b/res/app/settings/notifications/index.js
@@ -2,7 +2,10 @@ module.exports = angular.module('settings-notifications', [
   require('stf/settings').name
 ])
   .run(["$templateCache", function($templateCache) {
-    $templateCache.put('settings/notifications/notifications.jade', require('./notifications.jade'))
+    $templateCache.put(
+      'settings/notifications/notifications.jade'
+    , require('./notifications.jade')
+    )
   }])
   .factory('NotificationsService', require('./notifications-service'))
   .controller('NotificationsCtrl', require('./notifications-controller'))
diff --git a/res/app/settings/notifications/notifications-controller.js b/res/app/settings/notifications/notifications-controller.js
index 0365bd92..095c80cd 100644
--- a/res/app/settings/notifications/notifications-controller.js
+++ b/res/app/settings/notifications/notifications-controller.js
@@ -1,3 +1,3 @@
-module.exports = function($scope) {
-    
-}
\ No newline at end of file
+module.exports = function NotificationsCtrl() {
+
+}