diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 27fd8fd9..7ac8573b 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -455,7 +455,7 @@ module.exports = function(serverOptions) {
             function getPrivacy(){
                 authApi.authorize(req, this);
             },
-            function gatekeep(err, authorized){
+            function validateAuthorization(err, authorized) {
                 if (req.profiler) {
                     req.profiler.done('authorize');
                 }
@@ -472,7 +472,9 @@ module.exports = function(serverOptions) {
                 pgConnection.setDBConn(user, req.params, this);
             },
             function finishSetup(err) {
-                if ( err ) { callback(err, req); return; }
+                if ( err ) {
+                    return callback(err, req);
+                }
 
                 // Add default database connection parameters
                 // if none given