diff --git a/client/src/app/shared/forms/form-validators/user.ts b/client/src/app/shared/forms/form-validators/user.ts
index 087a99760..d4c4c1d33 100644
--- a/client/src/app/shared/forms/form-validators/user.ts
+++ b/client/src/app/shared/forms/form-validators/user.ts
@@ -28,4 +28,4 @@ export const USER_VIDEO_QUOTA = {
     'required': 'Video quota is required.',
     'min': 'Quota must be greater than -1.'
   }
-}
\ No newline at end of file
+}
diff --git a/server/controllers/api/remote/videos.ts b/server/controllers/api/remote/videos.ts
index 0a90549af..f7ee0356a 100644
--- a/server/controllers/api/remote/videos.ts
+++ b/server/controllers/api/remote/videos.ts
@@ -141,23 +141,23 @@ function processVideosEvents (eventData: RemoteVideoEventData, fromPod: PodInsta
         let qaduType
 
         switch (eventData.eventType) {
-          case REQUEST_VIDEO_EVENT_TYPES.VIEWS:
-            columnToUpdate = 'views'
-            qaduType = REQUEST_VIDEO_QADU_TYPES.VIEWS
-            break
+        case REQUEST_VIDEO_EVENT_TYPES.VIEWS:
+          columnToUpdate = 'views'
+          qaduType = REQUEST_VIDEO_QADU_TYPES.VIEWS
+          break
 
-          case REQUEST_VIDEO_EVENT_TYPES.LIKES:
-            columnToUpdate = 'likes'
-            qaduType = REQUEST_VIDEO_QADU_TYPES.LIKES
-            break
+        case REQUEST_VIDEO_EVENT_TYPES.LIKES:
+          columnToUpdate = 'likes'
+          qaduType = REQUEST_VIDEO_QADU_TYPES.LIKES
+          break
 
-          case REQUEST_VIDEO_EVENT_TYPES.DISLIKES:
-            columnToUpdate = 'dislikes'
-            qaduType = REQUEST_VIDEO_QADU_TYPES.DISLIKES
-            break
+        case REQUEST_VIDEO_EVENT_TYPES.DISLIKES:
+          columnToUpdate = 'dislikes'
+          qaduType = REQUEST_VIDEO_QADU_TYPES.DISLIKES
+          break
 
-          default:
-            throw new Error('Unknown video event type.')
+        default:
+          throw new Error('Unknown video event type.')
         }
 
         const query = {}
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 2e3472d1e..e6af406e3 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -77,7 +77,7 @@ const CONFIG = {
   },
   SIGNUP: {
     ENABLED: config.get<boolean>('signup.enabled'),
-    LIMIT: config.get<number>('signup.limit'),
+    LIMIT: config.get<number>('signup.limit')
   },
   USER: {
     VIDEO_QUOTA: config.get<number>('user.video_quota')
@@ -298,7 +298,7 @@ let STATIC_MAX_AGE = '30d'
 const THUMBNAILS_SIZE = '200x110'
 const PREVIEWS_SIZE = '640x480'
 
-// Subfolders of cache directory
+// Sub folders of cache directory
 const CACHE = {
   DIRECTORIES: {
     PREVIEWS: join(CONFIG.STORAGE.CACHE_DIR, 'previews')
diff --git a/server/lib/request/request-video-qadu-scheduler.ts b/server/lib/request/request-video-qadu-scheduler.ts
index afb9d5c23..d7e1d5e31 100644
--- a/server/lib/request/request-video-qadu-scheduler.ts
+++ b/server/lib/request/request-video-qadu-scheduler.ts
@@ -81,21 +81,21 @@ class RequestVideoQaduScheduler extends AbstractRequestScheduler<RequestsVideoQa
         if (!videoData) videoData = { uuid: null }
 
         switch (request.type) {
-          case REQUEST_VIDEO_QADU_TYPES.LIKES:
-            videoData.likes = video.likes
-            break
+        case REQUEST_VIDEO_QADU_TYPES.LIKES:
+          videoData.likes = video.likes
+          break
 
-          case REQUEST_VIDEO_QADU_TYPES.DISLIKES:
-            videoData.dislikes = video.dislikes
-            break
+        case REQUEST_VIDEO_QADU_TYPES.DISLIKES:
+          videoData.dislikes = video.dislikes
+          break
 
-          case REQUEST_VIDEO_QADU_TYPES.VIEWS:
-            videoData.views = video.views
-            break
+        case REQUEST_VIDEO_QADU_TYPES.VIEWS:
+          videoData.views = video.views
+          break
 
-          default:
-            logger.error('Unknown request video QADU type %s.', request.type)
-            return
+        default:
+          logger.error('Unknown request video QADU type %s.', request.type)
+          return
         }
 
         // Do not forget the uuid so the remote pod can identify the video
@@ -103,12 +103,12 @@ class RequestVideoQaduScheduler extends AbstractRequestScheduler<RequestsVideoQa
         requestsToMakeGrouped[hashKey].ids.push(request.id)
 
         // Maybe there are multiple quick and dirty update for the same video
-        // We use this hashmap to dedupe them
+        // We use this hash map to dedupe them
         requestsToMakeGrouped[hashKey].videos[video.id] = videoData
       })
     })
 
-    // Now we deduped similar quick and dirty updates, we can build our requests datas
+    // Now we deduped similar quick and dirty updates, we can build our requests data
     Object.keys(requestsToMakeGrouped).forEach(hashKey => {
       Object.keys(requestsToMakeGrouped[hashKey].videos).forEach(videoUUID => {
         const videoData = requestsToMakeGrouped[hashKey].videos[videoUUID]
@@ -118,7 +118,7 @@ class RequestVideoQaduScheduler extends AbstractRequestScheduler<RequestsVideoQa
         })
       })
 
-      // We don't need it anymore, it was just to build our datas array
+      // We don't need it anymore, it was just to build our data array
       delete requestsToMakeGrouped[hashKey].videos
     })
 
diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts
index 1d19ebfd9..576814fcb 100644
--- a/server/middlewares/validators/videos.ts
+++ b/server/middlewares/validators/videos.ts
@@ -39,7 +39,7 @@ function videosAddValidator (req: express.Request, res: express.Response, next:
       })
       .then(duration => {
         // Previous test failed, abort
-        if (duration === undefined) return
+        if (duration === undefined) return undefined
 
         if (!isVideoDurationValid('' + duration)) {
           return res.status(400).send('Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 4fb4485d8..8c69fe189 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -9,7 +9,6 @@ import * as Sequelize from 'sequelize'
 import * as Promise from 'bluebird'
 
 import { TagInstance } from './tag-interface'
-import { UserInstance } from '../user/user-interface'
 import {
   logger,
   isVideoNameValid,