diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java
index f709dc719..f7daef2ea 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanBungeeCommand.java
@@ -49,10 +49,6 @@ public class PlanBungeeCommand extends TreeCmdNode {
                 new StatusCommand<>(plugin, Permissions.MANAGE.getPermission(), plugin.getColorScheme()),
 //                        (Settings.ALLOW_UPDATE.isTrue() ? new UpdateCommand() : null)
         };
-        setNodeGroups(
-                analyticsGroup,
-                webGroup,
-                manageGroup
-        );
+        setNodeGroups(analyticsGroup, webGroup, manageGroup);
     }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
index 415888900..066e4672a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/ManageCommand.java
@@ -26,22 +26,21 @@ public class ManageCommand extends TreeCmdNode {
         setShortHelp(locale.getString(CmdHelpLang.MANAGE));
         setInDepthHelp(locale.getArray(DeepHelpLang.MANAGE));
         super.setColorScheme(plugin.getColorScheme());
-        setNodeGroups(
-                new CommandNode[]{
-                        new ManageRawDataCommand(plugin),
-                        new ManageMoveCommand(plugin),
-                        new ManageBackupCommand(plugin),
-                        new ManageRestoreCommand(plugin),
-                        new ManageRemoveCommand(plugin),
-                        new ManageHotSwapCommand(plugin),
-                        new ManageClearCommand(plugin),
-                },
-                new CommandNode[]{
-                        new ManageSetupCommand(plugin),
-                        new ManageConDebugCommand(plugin),
-                        new ManageImportCommand(plugin),
-                        new ManageDisableCommand(plugin)
-                }
-        );
+        CommandNode[] databaseGroup = {
+                new ManageRawDataCommand(plugin),
+                new ManageMoveCommand(plugin),
+                new ManageBackupCommand(plugin),
+                new ManageRestoreCommand(plugin),
+                new ManageRemoveCommand(plugin),
+                new ManageHotSwapCommand(plugin),
+                new ManageClearCommand(plugin),
+        };
+        CommandNode[] pluginGroup = {
+                new ManageSetupCommand(plugin),
+                new ManageConDebugCommand(plugin),
+                new ManageImportCommand(plugin),
+                new ManageDisableCommand(plugin)
+        };
+        setNodeGroups(databaseGroup, pluginGroup);
     }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java
index dda251209..61eacf38f 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/WebUserCommand.java
@@ -29,14 +29,13 @@ public class WebUserCommand extends TreeCmdNode {
 
         setShortHelp(locale.getString(CmdHelpLang.WEB));
         setInDepthHelp(locale.getArray(DeepHelpLang.WEB));
-        setNodeGroups(
-                new CommandNode[]{
-                        register,
-                        new WebLevelCommand(plugin),
-                        new WebListUsersCommand(plugin),
-                        new WebCheckCommand(plugin),
-                        new WebDeleteCommand(plugin)
-                }
-        );
+        CommandNode[] webGroup = {
+                register,
+                new WebLevelCommand(plugin),
+                new WebListUsersCommand(plugin),
+                new WebCheckCommand(plugin),
+                new WebDeleteCommand(plugin)
+        };
+        setNodeGroups(webGroup);
     }
 }