diff --git a/src/Command.zig b/src/Command.zig
index df0c29a..0f6dbf4 100644
--- a/src/Command.zig
+++ b/src/Command.zig
@@ -700,146 +700,140 @@ pub fn Custom(comptime config: Config) type {
                         }
                         try writer.print("\n", .{});
                     },
-                    .Commands => {
-                        if (self.sub_cmds) |sub_cmds| {
-                            try writer.print(subcmds_help_title_fmt, .{ indent_fmt });
-                            var cmd_list = std.StringArrayHashMap(@This()).init(alloc);
-                            defer cmd_list.deinit();
-                            for (sub_cmds) |cmd| try cmd_list.put(cmd.name, cmd);
-                            var remove_list = std.ArrayList([]const u8).init(alloc);
-                            defer remove_list.deinit();
-                            if (self.cmd_groups) |groups| {
-                                var need_other_title = false;
-                                for (groups) |group| {
-                                    var need_title = true;
-                                    var cmd_iter = cmd_list.iterator();
-                                    cmdGroup: while (cmd_iter.next()) |cmd_entry| {
-                                        const cmd = cmd_entry.value_ptr;
-                                        if (cmd.hidden) {
-                                            try remove_list.append(cmd.name);
-                                            continue;
+                    .Commands => if (self.sub_cmds) |sub_cmds| {
+                        try writer.print(subcmds_help_title_fmt, .{ indent_fmt });
+                        var cmd_list = std.StringArrayHashMap(@This()).init(alloc);
+                        defer cmd_list.deinit();
+                        for (sub_cmds) |cmd| try cmd_list.put(cmd.name, cmd);
+                        var remove_list = std.ArrayList([]const u8).init(alloc);
+                        defer remove_list.deinit();
+                        if (self.cmd_groups) |groups| {
+                            var need_other_title = false;
+                            for (groups) |group| {
+                                var need_title = true;
+                                var cmd_iter = cmd_list.iterator();
+                                cmdGroup: while (cmd_iter.next()) |cmd_entry| {
+                                    const cmd = cmd_entry.value_ptr;
+                                    if (cmd.hidden) {
+                                        try remove_list.append(cmd.name);
+                                        continue;
+                                    }
+                                    if (mem.eql(u8, cmd.cmd_group orelse continue :cmdGroup, group)) {
+                                        if (need_title) {
+                                            try writer.print(group_title_fmt, .{ indent_fmt, group });
+                                            need_title = false;
+                                            need_other_title = true;
                                         }
-                                        if (mem.eql(u8, cmd.cmd_group orelse continue :cmdGroup, group)) {
-                                            if (need_title) {
-                                                try writer.print(group_title_fmt, .{ indent_fmt, group });
-                                                need_title = false;
-                                                need_other_title = true;
-                                            }
-                                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                            try writer.print(subcmds_help_fmt, .{ cmd.name, cmd.description });
-                                            if (cmd.alias_names) |aliases| {
-                                                try writer.print("\n{s}{s}{s}", .{ indent_fmt, indent_fmt, indent_fmt });
-                                                try writer.print(subcmd_alias_fmt, .{ aliases });
-                                            }
-                                            try writer.print("\n", .{});
-                                            try remove_list.append(cmd.name);
+                                        try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                                        try writer.print(subcmds_help_fmt, .{ cmd.name, cmd.description });
+                                        if (cmd.alias_names) |aliases| {
+                                            try writer.print("\n{s}{s}{s}", .{ indent_fmt, indent_fmt, indent_fmt });
+                                            try writer.print(subcmd_alias_fmt, .{ aliases });
                                         }
+                                        try writer.print("\n", .{});
+                                        try remove_list.append(cmd.name);
                                     }
-                                    if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                                 }
-                                if (need_other_title and remove_list.items.len < cmd_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
-                            }
-                            for (remove_list.items) |rem_name| _ = cmd_list.orderedRemove(rem_name);
-
-                            var cmd_iter = cmd_list.iterator();
-                            while (cmd_iter.next()) |cmd_entry| {
-                                const cmd = cmd_entry.value_ptr;
-                                if (cmd.hidden) continue;
-                                try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                try writer.print(subcmds_help_fmt, .{ cmd.name, cmd.description });
-                                try writer.print("\n", .{});
+                                if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                             }
+                            if (need_other_title and remove_list.items.len < cmd_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
+                        }
+                        for (remove_list.items) |rem_name| _ = cmd_list.orderedRemove(rem_name);
+
+                        var cmd_iter = cmd_list.iterator();
+                        while (cmd_iter.next()) |cmd_entry| {
+                            const cmd = cmd_entry.value_ptr;
+                            if (cmd.hidden) continue;
+                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                            try writer.print(subcmds_help_fmt, .{ cmd.name, cmd.description });
+                            try writer.print("\n", .{});
                         }
                         try writer.print("\n", .{});
                     },
-                    .Options => {
-                        if (self.opts) |opts| {
-                            try writer.print(opts_help_title_fmt, .{ indent_fmt });
-                            var opt_list = std.StringArrayHashMap(OptionT).init(alloc);
-                            defer opt_list.deinit();
-                            for (opts) |opt| try opt_list.put(opt.name, opt);
-                            var remove_list = std.ArrayList([]const u8).init(alloc);
-                            defer remove_list.deinit();
-                            if (self.opt_groups) |groups| {
-                                var need_other_title = false;
-                                for (groups) |group| {
-                                    var need_title = true;
-                                    var opt_iter = opt_list.iterator();
-                                    optGroup: while (opt_iter.next()) |opt_entry| {
-                                        const opt = opt_entry.value_ptr;
-                                        if (opt.hidden) {
-                                            try remove_list.append(opt.name);
-                                            continue;
-                                        }
-                                        if (mem.eql(u8, opt.opt_group orelse continue :optGroup, group)) {
-                                            if (need_title) {
-                                                try writer.print(group_title_fmt, .{ indent_fmt, group });
-                                                need_title = false;
-                                                need_other_title = true;
-                                            }
-                                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                            try opt.help(writer);
-                                            try writer.print("\n", .{});
-                                            try remove_list.append(opt.name);
+                    .Options => if (self.opts) |opts| {
+                    try writer.print(opts_help_title_fmt, .{ indent_fmt });
+                    var opt_list = std.StringArrayHashMap(OptionT).init(alloc);
+                        defer opt_list.deinit();
+                        for (opts) |opt| try opt_list.put(opt.name, opt);
+                        var remove_list = std.ArrayList([]const u8).init(alloc);
+                        defer remove_list.deinit();
+                        if (self.opt_groups) |groups| {
+                            var need_other_title = false;
+                            for (groups) |group| {
+                                var need_title = true;
+                                var opt_iter = opt_list.iterator();
+                                optGroup: while (opt_iter.next()) |opt_entry| {
+                                    const opt = opt_entry.value_ptr;
+                                    if (opt.hidden) {
+                                        try remove_list.append(opt.name);
+                                        continue;
+                                    }
+                                    if (mem.eql(u8, opt.opt_group orelse continue :optGroup, group)) {
+                                        if (need_title) {
+                                            try writer.print(group_title_fmt, .{ indent_fmt, group });
+                                            need_title = false;
+                                            need_other_title = true;
                                         }
+                                        try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                                        try opt.help(writer);
+                                        try writer.print("\n", .{});
+                                        try remove_list.append(opt.name);
                                     }
-                                    if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                                 }
-                                if (need_other_title and remove_list.items.len < opt_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
-                            }
-                            for (remove_list.items) |rem_name| _ = opt_list.orderedRemove(rem_name);
-
-                            var opt_iter = opt_list.iterator();
-                            while (opt_iter.next()) |opt_entry| {
-                                const opt = opt_entry.value_ptr;
-                                if (opt.hidden) continue;
-                                try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                try opt.help(writer);
-                                try writer.print("\n", .{});
+                                if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                             }
+                            if (need_other_title and remove_list.items.len < opt_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
+                        }
+                        for (remove_list.items) |rem_name| _ = opt_list.orderedRemove(rem_name);
+
+                        var opt_iter = opt_list.iterator();
+                        while (opt_iter.next()) |opt_entry| {
+                            const opt = opt_entry.value_ptr;
+                            if (opt.hidden) continue;
+                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                            try opt.help(writer);
+                            try writer.print("\n", .{});
                         }
                         try writer.print("\n", .{});
                     },
-                    .Values => {
-                        if (self.vals) |vals| {
-                            try writer.print(vals_help_title_fmt, .{ indent_fmt });
-                            var val_list = std.StringArrayHashMap(ValueT).init(alloc);
-                            defer val_list.deinit();
-                            for (vals) |val| try val_list.put(val.name(), val);
-                            var remove_list = std.ArrayList([]const u8).init(alloc);
-                            defer remove_list.deinit();
-                            if (self.val_groups) |groups| {
-                                var need_other_title = false;
-                                for (groups) |group| {
-                                    var need_title = true;
-                                    var val_iter = val_list.iterator();
-                                    valGroup: while (val_iter.next()) |val_entry| {
-                                        const val = val_entry.value_ptr;
-                                        if (mem.eql(u8, val.valGroup() orelse continue :valGroup, group)) {
-                                            if (need_title) {
-                                                try writer.print(group_title_fmt, .{ indent_fmt, group });
-                                                need_title = false;
-                                                need_other_title = true;
-                                            }
-                                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                            try val.help(writer);
-                                            try writer.print("\n", .{});
-                                            try remove_list.append(val.name());
+                    .Values => if (self.vals) |vals| {
+                        try writer.print(vals_help_title_fmt, .{ indent_fmt });
+                        var val_list = std.StringArrayHashMap(ValueT).init(alloc);
+                        defer val_list.deinit();
+                        for (vals) |val| try val_list.put(val.name(), val);
+                        var remove_list = std.ArrayList([]const u8).init(alloc);
+                        defer remove_list.deinit();
+                        if (self.val_groups) |groups| {
+                            var need_other_title = false;
+                            for (groups) |group| {
+                                var need_title = true;
+                                var val_iter = val_list.iterator();
+                                valGroup: while (val_iter.next()) |val_entry| {
+                                    const val = val_entry.value_ptr;
+                                    if (mem.eql(u8, val.valGroup() orelse continue :valGroup, group)) {
+                                        if (need_title) {
+                                            try writer.print(group_title_fmt, .{ indent_fmt, group });
+                                            need_title = false;
+                                            need_other_title = true;
                                         }
+                                        try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                                        try val.help(writer);
+                                        try writer.print("\n", .{});
+                                        try remove_list.append(val.name());
                                     }
-                                    if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                                 }
-                                if (need_other_title and remove_list.items.len < val_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
-                            }
-                            for (remove_list.items) |rem_name| _ = val_list.orderedRemove(rem_name);
-
-                            var val_iter = val_list.iterator();
-                            while (val_iter.next()) |val_entry| {
-                                const val = val_entry.value_ptr;
-                                try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
-                                try val.help(writer);
-                                try writer.print("\n", .{});
+                                if (!need_title) try writer.print(group_sep_fmt, .{ indent_fmt, indent_fmt });
                             }
+                            if (need_other_title and remove_list.items.len < val_list.count()) try writer.print(group_title_fmt, .{ indent_fmt, "OTHER" });
+                        }
+                        for (remove_list.items) |rem_name| _ = val_list.orderedRemove(rem_name);
+
+                        var val_iter = val_list.iterator();
+                        while (val_iter.next()) |val_entry| {
+                            const val = val_entry.value_ptr;
+                            try writer.print("{s}{s}", .{ indent_fmt, indent_fmt });
+                            try val.help(writer);
+                            try writer.print("\n", .{});
                         }
                         try writer.print("\n", .{});
                     },