diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js
index 1ebb42e9..aa395613 100644
--- a/lib/cloudcmd.js
+++ b/lib/cloudcmd.js
@@ -41,14 +41,10 @@ emptyFunc.middle    = function() {
 };
 
 function getPrefix(prefix) {
-    var result;
-    
     if (typeof prefix === 'function')
-        result = prefix();
-    else
-        result = prefix;
+        return prefix() || '';
     
-    return result || '';
+    return prefix || '';
 }
 
 module.exports = function(params) {
@@ -165,125 +161,122 @@ function listen(prefix, socket) {
 
 function cloudcmd(prefix) {
     var isOption    = function(name) {
-            return config(name);
-        },
-        
-        isMinify    = apart(isOption, 'minify'),
-        isOnline    = apart(isOption, 'online'),
-        isCache     = apart(isOption, 'cache'),
-        isDiff      = apart(isOption, 'diff'),
-        isZip       = apart(isOption, 'zip'),
-        
-        ponseStatic = ponse.static(DIR_ROOT, {
-            cache: isCache
+        return config(name);
+    };
+    
+    var isMinify = apart(isOption, 'minify');
+    var isOnline = apart(isOption, 'online');
+    var isCache = apart(isOption, 'cache');
+    var isDiff = apart(isOption, 'diff');
+    var isZip = apart(isOption, 'zip');
+    
+    var ponseStatic = ponse.static(DIR_ROOT, {
+        cache: isCache
+    });
+   
+    var funcs = [
+        konsole({
+            prefix: prefix + '/console',
+            minify: isMinify,
+            online: isOnline
         }),
         
-        funcs       = [
-            konsole({
-                prefix: prefix + '/console',
-                minify: isMinify,
-                online: isOnline
-            }),
-            
-            edward({
-                prefix  : prefix + '/edward',
-                minify  : isMinify,
-                online  : isOnline,
-                diff    : isDiff,
-                zip     : isZip
-            }),
-           
-            dword({
-                prefix  : prefix + '/dword',
-                minify  : isMinify,
-                online  : isOnline,
-                diff    : isDiff,
-                zip     : isZip
-            }),
-            
-            deepword({
-                prefix  : prefix + '/deepword',
-                minify  : isMinify,
-                online  : isOnline,
-                diff    : isDiff,
-                zip     : isZip
-            }),
-            
-            spero({
-                prefix  : prefix + '/spero',
-                minify  : isMinify,
-                online  : isOnline
-            }),
-            
-            remedy({
-                prefix  : prefix + '/remedy',
-                minify  : isMinify,
-                online  : isOnline
-            }),
-            
-            ishtar({
-                prefix  : prefix + '/ishtar',
-                minify  : isMinify,
-                online  : isOnline
-            }),
-            
-            salam({
-                prefix: prefix + '/salam',
-            }),
-            
-            setUrl(prefix),
-            
-            logout,
-            
-            auth(),
-            
-            config.middle,
-            
-            restafary({
-                prefix  : cloudfunc.apiURL + '/fs',
-                root    : root
-            }),
-            
-            rest,
-            route,
-            
-            join({
-                dir     : DIR_ROOT,
-                minify  : isMinify
-            }),
-            
-            mollify({
-                dir : DIR_ROOT,
-                is  : isMinify
-            }),
-            
-            ponseStatic
-        ];
+        edward({
+            prefix  : prefix + '/edward',
+            minify  : isMinify,
+            online  : isOnline,
+            diff    : isDiff,
+            zip     : isZip
+        }),
+       
+        dword({
+            prefix  : prefix + '/dword',
+            minify  : isMinify,
+            online  : isOnline,
+            diff    : isDiff,
+            zip     : isZip
+        }),
+        
+        deepword({
+            prefix  : prefix + '/deepword',
+            minify  : isMinify,
+            online  : isOnline,
+            diff    : isDiff,
+            zip     : isZip
+        }),
+        
+        spero({
+            prefix  : prefix + '/spero',
+            minify  : isMinify,
+            online  : isOnline
+        }),
+        
+        remedy({
+            prefix  : prefix + '/remedy',
+            minify  : isMinify,
+            online  : isOnline
+        }),
+        
+        ishtar({
+            prefix  : prefix + '/ishtar',
+            minify  : isMinify,
+            online  : isOnline
+        }),
+        
+        salam({
+            prefix: prefix + '/salam',
+        }),
+        
+        setUrl(prefix),
+        logout,
+        auth(),
+        config.middle,
+        
+        restafary({
+            prefix  : cloudfunc.apiURL + '/fs',
+            root    : root
+        }),
+        
+        rest,
+        route,
+        
+        join({
+            dir     : DIR_ROOT,
+            minify  : isMinify
+        }),
+        
+        mollify({
+            dir : DIR_ROOT,
+            is  : isMinify
+        }),
+        
+        ponseStatic
+    ];
     
     return funcs;
 }
 
 function logout(req, res, next) {
-    if (req.url === '/logout')
-        res.sendStatus(401);
-    else
-        next();
+    if (req.url !== '/logout')
+        return next();
+    
+    res.sendStatus(401);
 }
 
 function setUrl(pref) {
     return function(req, res, next) {
-        var is, prefix;
+        var prefix = getPrefix(pref);
+        var is = !req.url.indexOf(prefix);
         
-        prefix  = getPrefix(pref);
-        is      = !req.url.indexOf(prefix);
-        
-        if (is) {
-            req.url = req.url.replace(prefix, '') || '/';
+        if (!is)
+            return next();
             
-            if (req.url === '/cloudcmd.js')
-                req.url = '/lib/client/cloudcmd.js';
-        }
+        req.url = req.url.replace(prefix, '') || '/';
+        
+        if (req.url === '/cloudcmd.js')
+            req.url = '/lib/client/cloudcmd.js';
         
         next();
     };
 }
+