diff --git a/src/messaging/create.js b/src/messaging/create.js
index 4acd05a1b6..239aa54cfe 100644
--- a/src/messaging/create.js
+++ b/src/messaging/create.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var meta = require('../meta');
-var plugins = require('../plugins');
-var db = require('../database');
-var user = require('../user');
+const meta = require('../meta');
+const plugins = require('../plugins');
+const db = require('../database');
+const user = require('../user');
 
 module.exports = function (Messaging) {
 	Messaging.sendMessage = async (data) => {
@@ -21,7 +21,7 @@ module.exports = function (Messaging) {
 			throw new Error('[[error:invalid-chat-message]]');
 		}
 
-		const maximumChatMessageLength = (meta.config.maximumChatMessageLength || 1000);
+		const maximumChatMessageLength = meta.config.maximumChatMessageLength || 1000;
 		const data = await plugins.fireHook('filter:messaging.checkContent', { content: content });
 		content = String(data.content).trim();
 		if (!content) {
diff --git a/src/messaging/data.js b/src/messaging/data.js
index c1bca1a4ab..21ea1e7d17 100644
--- a/src/messaging/data.js
+++ b/src/messaging/data.js
@@ -2,10 +2,10 @@
 
 const validator = require('validator');
 
-var db = require('../database');
-var user = require('../user');
-var utils = require('../utils');
-var plugins = require('../plugins');
+const db = require('../database');
+const user = require('../user');
+const utils = require('../utils');
+const plugins = require('../plugins');
 
 const intFields = ['timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system'];
 
diff --git a/src/messaging/delete.js b/src/messaging/delete.js
index b7c1bbbd1b..9a4c551d2f 100644
--- a/src/messaging/delete.js
+++ b/src/messaging/delete.js
@@ -11,6 +11,6 @@ module.exports = function (Messaging) {
 			throw new Error('[[error:chat-' + field + '-already]]');
 		}
 
-		return await Messaging.setMessageField(mid, 'deleted', state);
+		await Messaging.setMessageField(mid, 'deleted', state);
 	}
 };
diff --git a/src/messaging/edit.js b/src/messaging/edit.js
index 349c66fa28..add728c416 100644
--- a/src/messaging/edit.js
+++ b/src/messaging/edit.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var meta = require('../meta');
-var user = require('../user');
+const meta = require('../meta');
+const user = require('../user');
 
-var sockets = require('../socket.io');
+const sockets = require('../socket.io');
 
 
 module.exports = function (Messaging) {
@@ -63,7 +63,7 @@ module.exports = function (Messaging) {
 		if (isAdmin && !messageData.system) {
 			return;
 		}
-		var chatConfigDuration = meta.config[durationConfig];
+		const chatConfigDuration = meta.config[durationConfig];
 		if (chatConfigDuration && Date.now() - messageData.timestamp > chatConfigDuration * 1000) {
 			throw new Error('[[error:chat-' + type + '-duration-expired, ' + meta.config[durationConfig] + ']]');
 		}
diff --git a/src/messaging/index.js b/src/messaging/index.js
index 2bcad1445b..a29abfe733 100644
--- a/src/messaging/index.js
+++ b/src/messaging/index.js
@@ -139,14 +139,8 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {
 	});
 };
 
-Messaging.generateUsernames = (users, excludeUid) => {
-	users = users.filter(function (user) {
-		return user && parseInt(user.uid, 10) !== excludeUid;
-	});
-	return users.map(function (user) {
-		return user.username;
-	}).join(', ');
-};
+Messaging.generateUsernames = (users, excludeUid) => users.filter(user => user && parseInt(user.uid, 10) !== excludeUid)
+	.map(user => user.username).join(', ');
 
 Messaging.getTeaser = async (uid, roomId) => {
 	const mid = await Messaging.getLatestUndeletedMessage(uid, roomId);