diff --git a/node/db/API.js b/node/db/API.js
index 7a3dc952c..f996f0f0e 100644
--- a/node/db/API.js
+++ b/node/db/API.js
@@ -473,36 +473,36 @@ Example returns:
 */
 exports.listAllPads = function(callback)
 {
-    allPads = [];
-    
-    var defaultGroup = "g.defaultGroupName";
-    
-    //get all groups
-    groupManager.listGroups(function (err, groups)
-    {
-        groups=groups["groupIDs"];
-        // if defaultGroup exists add this too, becaus ists not listed in groupManager.listGroups
-        groupManager.doesGroupExist(defaultGroup, function(err, exists)
-        {
-            if(exists)
-            {
-                groups.push(defaultGroup);
-            }
-        });
+  allPads = [];
 
-        for(var group in groups)
-        {
-            groupManager.listPads(groups[group], function(err, pads)
-            {
-                for(var pad in pads["padIDs"])
-                {
-                    allPads.push(pads["padIDs"][pad]);
-                }
-            });
-        }
+  var defaultGroup = "g.defaultGroupName";
+
+  //get all groups
+  groupManager.listGroups(function (err, groups)
+  {
+    groups=groups["groupIDs"];
+    // if defaultGroup exists add this too, becaus ists not listed in groupManager.listGroups
+    groupManager.doesGroupExist(defaultGroup, function(err, exists)
+    {
+      if(exists)
+      {
+          groups.push(defaultGroup);
+      }
     });
     
-    callback(null, {padIDs: allPads});
+    for(var group in groups)
+    {
+      groupManager.listPads(groups[group], function(err, pads)
+      {
+        for(var pad in pads["padIDs"])
+        {
+          allPads.push(pads["padIDs"][pad]);
+        }
+      });
+    }
+  });
+
+  callback(null, {padIDs: allPads});
 }
 
 /******************************/
diff --git a/node/db/GroupManager.js b/node/db/GroupManager.js
index 4a7aa9648..4709a5b03 100644
--- a/node/db/GroupManager.js
+++ b/node/db/GroupManager.js
@@ -106,29 +106,25 @@ exports.deleteGroup = function(groupID, callback)
       db.get("groups", function (err, groups)
       {
         if(ERR(err, callback)) return;
-
-            if(ERR(err, callback)) return;
+        
+          existingGroups = [];
             
-            existingGroups = [];
-            
-            if(groups != undefined)
+          if(groups != undefined)
+          {
+            for(var key in groups['groups'])
             {
-                for(var key in groups['groups'])
-                {
-                    if(groupID != groups['groups'][key]) 
-                    {
-                        existingGroups.push(groups['groups'][key]);
-                    }
-                }
+              if(groupID != groups['groups'][key]) 
+              {
+                existingGroups.push(groups['groups'][key]);
+              }
             }
+          }
             
-            db.set("groups", {groups: existingGroups});
+        db.set("groups", {groups: existingGroups});
       });
-
+      
       db.remove("group2sessions:" + groupID);
       db.remove("group:" + groupID);
-      
-
       callback();
     }
   ], function(err)
@@ -169,10 +165,10 @@ exports.createGroup = function(callback)
     if(ERR(err, callback)) return;
     if(responseGroups != undefined)
     {
-        for(var key in responseGroups['groups'])
-        {
-            existingGroups.push(responseGroups['groups'][key]);
-        }
+      for(var key in responseGroups['groups'])
+      {
+        existingGroups.push(responseGroups['groups'][key]);
+      }
     }
   });
   
diff --git a/node/db/Pad.js b/node/db/Pad.js
index a5893424c..ca77c235e 100644
--- a/node/db/Pad.js
+++ b/node/db/Pad.js
@@ -351,21 +351,21 @@ Pad.prototype.init = function init(text, callback) {
     else
     {
       var firstChangeset = Changeset.makeSplice("\n", 0, 0, exports.cleanText(text));
-      
+
       // if this is a non group pad, add this to the defaultGroup
       if(_this.id.indexOf("$")==-1)
       {
         groupID = "g.defaultGroupName";
         groupManager.doesGroupExist(groupID, function(err, exists)
         {
-            if(!exists)
-            {
-                db.set("group:" + groupID, {pads: {}});
-            }
+          if(!exists)
+          {
+            db.set("group:" + groupID, {pads: {}});
+          }
         });
         db.setSub("group:"+groupID, ["pads", _this.id], 1);
       }
-      
+
       _this.appendRevision(firstChangeset, '');
     }