diff --git a/src/controllers/accounts/follow.js b/src/controllers/accounts/follow.js
index eac274136d..3c3e6a3338 100644
--- a/src/controllers/accounts/follow.js
+++ b/src/controllers/accounts/follow.js
@@ -7,7 +7,7 @@ var helpers = require('../helpers');
 var accountHelpers = require('./helpers');
 var pagination = require('../../pagination');
 
-var followController = {};
+var followController = module.exports;
 
 followController.getFollowing = function (req, res, next) {
 	getFollow('account/following', 'following', req, res, next);
@@ -37,20 +37,15 @@ function getFollow(tpl, name, req, res, callback) {
 			var method = name === 'following' ? 'getFollowing' : 'getFollowers';
 			user[method](userData.uid, start, stop, next);
 		},
-	], function (err, users) {
-		if (err) {
-			return callback(err);
-		}
-
-		userData.users = users;
-		userData.title = '[[pages:' + tpl + ', ' + userData.username + ']]';
-		var count = name === 'following' ? userData.followingCount : userData.followerCount;
-		var pageCount = Math.ceil(count / resultsPerPage);
-		userData.pagination = pagination.create(page, pageCount);
-		userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[user:' + name + ']]' }]);
-
-		res.render(tpl, userData);
-	});
+		function (users) {
+			userData.users = users;
+			userData.title = '[[pages:' + tpl + ', ' + userData.username + ']]';
+			var count = name === 'following' ? userData.followingCount : userData.followerCount;
+			var pageCount = Math.ceil(count / resultsPerPage);
+			userData.pagination = pagination.create(page, pageCount);
+			userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[user:' + name + ']]' }]);
+
+			res.render(tpl, userData);
+		},
+	], callback);
 }
-
-module.exports = followController;
diff --git a/src/controllers/accounts/groups.js b/src/controllers/accounts/groups.js
index 650c510fc9..fde4718eb4 100644
--- a/src/controllers/accounts/groups.js
+++ b/src/controllers/accounts/groups.js
@@ -7,8 +7,7 @@ var groups = require('../../groups');
 var helpers = require('../helpers');
 var accountHelpers = require('./helpers');
 
-var groupsController = {};
-
+var groupsController = module.exports;
 
 groupsController.get = function (req, res, callback) {
 	var userData;
@@ -27,28 +26,18 @@ groupsController.get = function (req, res, callback) {
 		},
 		function (_groupsData, next) {
 			groupsData = _groupsData[0];
-			var groupNames = groupsData.filter(Boolean).map(function (group) {
-				return group.name;
-			});
+			const groupNames = groupsData.filter(Boolean).map(group => group.name);
 
 			groups.getMemberUsers(groupNames, 0, 3, next);
 		},
-		function (members, next) {
+		function (members) {
 			groupsData.forEach(function (group, index) {
 				group.members = members[index];
 			});
-			next();
+			userData.groups = groupsData;
+			userData.title = '[[pages:account/groups, ' + userData.username + ']]';
+			userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:header.groups]]' }]);
+			res.render('account/groups', userData);
 		},
-	], function (err) {
-		if (err) {
-			return callback(err);
-		}
-
-		userData.groups = groupsData;
-		userData.title = '[[pages:account/groups, ' + userData.username + ']]';
-		userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:header.groups]]' }]);
-		res.render('account/groups', userData);
-	});
+	], callback);
 };
-
-module.exports = groupsController;