diff --git a/controllers/api/v1/index.js b/controllers/api/v1/index.js
index fc6bf4946..07a68ed9d 100644
--- a/controllers/api/v1/index.js
+++ b/controllers/api/v1/index.js
@@ -4,9 +4,13 @@ var express = require('express')
 
 var router = express.Router()
 
-router.use('/pods', require('./pods'))
-router.use('/remotevideos', require('./remoteVideos'))
-router.use('/videos', require('./videos'))
+var podsController = require('./pods')
+var remoteVideosController = require('./remoteVideos')
+var videosController = require('./videos')
+
+router.use('/pods', podsController)
+router.use('/remotevideos', remoteVideosController)
+router.use('/videos', videosController)
 
 // ---------------------------------------------------------------------------
 
diff --git a/controllers/index.js b/controllers/index.js
index 35a0191c5..858f493da 100644
--- a/controllers/index.js
+++ b/controllers/index.js
@@ -2,7 +2,10 @@
 
 var constants = require('../initializers/constants')
 
+var apiController = require('./api/' + constants.API_VERSION)
+var viewsController = require('./views')
+
 module.exports = {
-  api: require('./api/' + constants.API_VERSION),
-  views: require('./views')
+  api: apiController,
+  views: viewsController
 }
diff --git a/middlewares/index.js b/middlewares/index.js
index c76c4fc2e..c85899b0c 100644
--- a/middlewares/index.js
+++ b/middlewares/index.js
@@ -1,9 +1,13 @@
 'use strict'
 
+var cacheMiddleware = require('./cache')
+var reqValidatorsMiddleware = require('./reqValidators')
+var secureMiddleware = require('./secure')
+
 var middlewares = {
-  cache: require('./cache'),
-  reqValidators: require('./reqValidators'),
-  secure: require('./secure')
+  cache: cacheMiddleware,
+  reqValidators: reqValidatorsMiddleware,
+  secure: secureMiddleware
 }
 
 // ---------------------------------------------------------------------------
diff --git a/middlewares/reqValidators/index.js b/middlewares/reqValidators/index.js
index 344387a80..345dbd0e2 100644
--- a/middlewares/reqValidators/index.js
+++ b/middlewares/reqValidators/index.js
@@ -1,9 +1,13 @@
 'use strict'
 
+var podsReqValidators = require('./pods')
+var remoteReqValidators = require('./remote')
+var videosReqValidators = require('./videos')
+
 var reqValidators = {
-  videos: require('./videos'),
-  pods: require('./pods'),
-  remote: require('./remote')
+  pods: podsReqValidators,
+  remote: remoteReqValidators,
+  videos: videosReqValidators
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server.js b/server.js
index c40513047..6312a4048 100644
--- a/server.js
+++ b/server.js
@@ -1,171 +1,169 @@
-;(function () {
-  'use strict'
+'use strict'
 
-  // ----------- Node modules -----------
-  var bodyParser = require('body-parser')
-  var express = require('express')
-  var expressValidator = require('express-validator')
-  var http = require('http')
-  var morgan = require('morgan')
-  var path = require('path')
-  var TrackerServer = require('bittorrent-tracker').Server
-  var WebSocketServer = require('ws').Server
+// ----------- Node modules -----------
+var bodyParser = require('body-parser')
+var express = require('express')
+var expressValidator = require('express-validator')
+var http = require('http')
+var morgan = require('morgan')
+var path = require('path')
+var TrackerServer = require('bittorrent-tracker').Server
+var WebSocketServer = require('ws').Server
 
-  // Create our main app
-  var app = express()
+// Create our main app
+var app = express()
 
-  // ----------- Checker -----------
-  var checker = require('./initializers/checker')
+// ----------- Checker -----------
+var checker = require('./initializers/checker')
 
-  var miss = checker.checkConfig()
-  if (miss.length !== 0) {
-    // Do not use logger module
-    console.error('Miss some configurations keys.', { miss: miss })
-    process.exit(0)
-  }
+var miss = checker.checkConfig()
+if (miss.length !== 0) {
+  // Do not use logger module
+  console.error('Miss some configurations keys.', { miss: miss })
+  process.exit(0)
+}
 
-  checker.createDirectoriesIfNotExist()
+checker.createDirectoriesIfNotExist()
 
-  // ----------- PeerTube modules -----------
-  var config = require('config')
-  var constants = require('./initializers/constants')
-  var customValidators = require('./helpers/customValidators')
-  var database = require('./initializers/database')
-  var logger = require('./helpers/logger')
-  var peertubeCrypto = require('./helpers/peertubeCrypto')
-  var poolRequests = require('./lib/poolRequests')
-  var routes = require('./controllers')
-  var utils = require('./helpers/utils')
-  var videos = require('./lib/videos')
-  var webtorrent = require('./lib/webtorrent')
+// ----------- PeerTube modules -----------
+var config = require('config')
+var constants = require('./initializers/constants')
+var customValidators = require('./helpers/customValidators')
+var database = require('./initializers/database')
+var logger = require('./helpers/logger')
+var peertubeCrypto = require('./helpers/peertubeCrypto')
+var poolRequests = require('./lib/poolRequests')
+var routes = require('./controllers')
+var utils = require('./helpers/utils')
+var videos = require('./lib/videos')
+var webtorrent = require('./lib/webtorrent')
 
-  // Get configurations
-  var port = config.get('listen.port')
+// Get configurations
+var port = config.get('listen.port')
 
-  // ----------- Database -----------
-  database.connect()
+// ----------- Database -----------
+database.connect()
 
-  // ----------- Command line -----------
+// ----------- Command line -----------
 
-  // ----------- App -----------
+// ----------- App -----------
 
-  // For the logger
-  app.use(morgan('combined', { stream: logger.stream }))
-  // For body requests
-  app.use(bodyParser.json())
-  app.use(bodyParser.urlencoded({ extended: false }))
-  // Validate some params for the API
-  app.use(expressValidator({
-    customValidators: customValidators
-  }))
+// For the logger
+app.use(morgan('combined', { stream: logger.stream }))
+// For body requests
+app.use(bodyParser.json())
+app.use(bodyParser.urlencoded({ extended: false }))
+// Validate some params for the API
+app.use(expressValidator({
+  customValidators: customValidators
+}))
 
-  // ----------- Views, routes and static files -----------
+// ----------- Views, routes and static files -----------
 
-  // Livereload
-  app.use(require('connect-livereload')({
-    port: 35729
-  }))
+// Livereload
+app.use(require('connect-livereload')({
+  port: 35729
+}))
 
-  // Catch sefaults
-  require('segfault-handler').registerHandler()
+// Catch sefaults
+require('segfault-handler').registerHandler()
 
-  // Static files
-  app.use(express.static(path.join(__dirname, '/public'), { maxAge: 0 }))
+// Static files
+app.use(express.static(path.join(__dirname, '/public'), { maxAge: 0 }))
 
-  // Jade template from ./views directory
-  app.set('views', path.join(__dirname, '/views'))
-  app.set('view engine', 'jade')
+// Jade template from ./views directory
+app.set('views', path.join(__dirname, '/views'))
+app.set('view engine', 'jade')
 
-  // API routes
-  var api_route = '/api/' + constants.API_VERSION
-  app.use(api_route, routes.api)
+// API routes
+var api_route = '/api/' + constants.API_VERSION
+app.use(api_route, routes.api)
 
-  // Views routes
-  app.use('/', routes.views)
+// Views routes
+app.use('/', routes.views)
 
-  // ----------- Tracker -----------
+// ----------- Tracker -----------
 
-  var trackerServer = new TrackerServer({
-    http: false,
-    udp: false,
-    ws: false,
-    dht: false
-  })
+var trackerServer = new TrackerServer({
+  http: false,
+  udp: false,
+  ws: false,
+  dht: false
+})
 
-  trackerServer.on('error', function (err) {
+trackerServer.on('error', function (err) {
+  logger.error(err)
+})
+
+trackerServer.on('warning', function (err) {
+  logger.error(err)
+})
+
+var server = http.createServer(app)
+var wss = new WebSocketServer({server: server, path: '/tracker/socket'})
+wss.on('connection', function (ws) {
+  trackerServer.onWebSocketConnection(ws)
+})
+
+// ----------- Errors -----------
+
+// Catch 404 and forward to error handler
+app.use(function (req, res, next) {
+  var err = new Error('Not Found')
+  err.status = 404
+  next(err)
+})
+
+// Prod : no stacktraces leaked to user
+if (process.env.NODE_ENV === 'production') {
+  app.use(function (err, req, res, next) {
     logger.error(err)
+    res.status(err.status || 500)
+    res.render('error', {
+      message: err.message,
+      error: {}
+    })
   })
-
-  trackerServer.on('warning', function (err) {
+} else {
+  app.use(function (err, req, res, next) {
     logger.error(err)
-  })
-
-  var server = http.createServer(app)
-  var wss = new WebSocketServer({server: server, path: '/tracker/socket'})
-  wss.on('connection', function (ws) {
-    trackerServer.onWebSocketConnection(ws)
-  })
-
-  // ----------- Errors -----------
-
-  // Catch 404 and forward to error handler
-  app.use(function (req, res, next) {
-    var err = new Error('Not Found')
-    err.status = 404
-    next(err)
-  })
-
-  // Prod : no stacktraces leaked to user
-  if (process.env.NODE_ENV === 'production') {
-    app.use(function (err, req, res, next) {
-      logger.error(err)
-      res.status(err.status || 500)
-      res.render('error', {
-        message: err.message,
-        error: {}
-      })
+    res.status(err.status || 500)
+    res.render('error', {
+      message: err.message,
+      error: err
     })
-  } else {
-    app.use(function (err, req, res, next) {
-      logger.error(err)
-      res.status(err.status || 500)
-      res.render('error', {
-        message: err.message,
-        error: err
-      })
-    })
-  }
+  })
+}
 
-  // ----------- Create the certificates if they don't already exist -----------
-  peertubeCrypto.createCertsIfNotExist(function (err) {
-    if (err) throw err
-    // Create/activate the webtorrent module
-    webtorrent.create(function () {
-      function cleanForExit () {
-        utils.cleanForExit(webtorrent.app)
-      }
+// ----------- Create the certificates if they don't already exist -----------
+peertubeCrypto.createCertsIfNotExist(function (err) {
+  if (err) throw err
+  // Create/activate the webtorrent module
+  webtorrent.create(function () {
+    function cleanForExit () {
+      utils.cleanForExit(webtorrent.app)
+    }
 
-      function exitGracefullyOnSignal () {
-        process.exit()
-      }
+    function exitGracefullyOnSignal () {
+      process.exit()
+    }
 
-      process.on('exit', cleanForExit)
-      process.on('SIGINT', exitGracefullyOnSignal)
-      process.on('SIGTERM', exitGracefullyOnSignal)
+    process.on('exit', cleanForExit)
+    process.on('SIGINT', exitGracefullyOnSignal)
+    process.on('SIGTERM', exitGracefullyOnSignal)
 
-      // ----------- Make the server listening -----------
-      server.listen(port, function () {
-        // Activate the pool requests
-        poolRequests.activate()
+    // ----------- Make the server listening -----------
+    server.listen(port, function () {
+      // Activate the pool requests
+      poolRequests.activate()
 
-        videos.seedAllExisting(function () {
-          logger.info('Seeded all the videos')
-          logger.info('Server listening on port %d', port)
-          app.emit('ready')
-        })
+      videos.seedAllExisting(function () {
+        logger.info('Seeded all the videos')
+        logger.info('Server listening on port %d', port)
+        app.emit('ready')
       })
     })
   })
+})
 
-  module.exports = app
-})()
+module.exports = app