diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
index d310bf4542c..d9853fbc3dc 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
@@ -73,7 +73,7 @@ class Command(
     }
 
     fun result(key: String, vararg args: Any): MutableText {
-        return translation("$translationBaseKey.result.$key", *args)
+        return translation("$translationBaseKey.result.$key", args = args)
     }
 
     fun resultWithTree(key: String, vararg args: Any): MutableText {
@@ -84,10 +84,10 @@ class Command(
                 parentCommand = parentCommand.parentCommand
             }
 
-            return parentCommand!!.result(key, *args)
+            return parentCommand!!.result(key, args = args)
         }
 
-        return translation("$translationBaseKey.result.$key", *args)
+        return translation("$translationBaseKey.result.$key", args = args)
     }
 
     /**
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/client/CommandBinds.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/client/CommandBinds.kt
index 06a22687655..01dfd635cc8 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/client/CommandBinds.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/client/CommandBinds.kt
@@ -73,14 +73,9 @@ object CommandBinds : CommandFactory {
                 .build()
         )
         .handler { command, args ->
-            val page = if (args.size > 1) {
-                args[0] as Int
-            } else {
-                1
-            }.coerceAtLeast(1)
-
-            val bindings = ModuleManager.sortedBy { it.name }
-                .filter { !it.bind.isUnbound }
+            val page = (args.firstOrNull() as? Int ?: 1).coerceAtLeast(1)
+
+            val bindings = ModuleManager.filter { !it.bind.isUnbound }
 
             if (bindings.isEmpty()) {
                 throw CommandException(command.result("noBindings"))
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/module/CommandAutoDisable.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/module/CommandAutoDisable.kt
index fb2bea9a39f..e9f5f661319 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/module/CommandAutoDisable.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/module/CommandAutoDisable.kt
@@ -72,11 +72,7 @@ object CommandAutoDisable : CommandFactory {
                 .build()
         )
         .handler { command, args ->
-            val page = if (args.size > 1) {
-                args[0] as Int
-            } else {
-                1
-            }.coerceAtLeast(1)
+            val page = (args.firstOrNull() as? Int ?: 1).coerceAtLeast(1)
 
             val modules = ModuleAutoDisable.listOfModules.sortedBy { it.name }
 
@@ -129,7 +125,7 @@ object CommandAutoDisable : CommandFactory {
                 .begin<String>("module")
                 .verifiedBy(ParameterBuilder.STRING_VALIDATOR)
                 .autocompletedWith { begin, _ ->
-                    ModuleAutoDisable.listOfModules.map { it.name }.toList().filter { it.startsWith(begin) }
+                    ModuleAutoDisable.listOfModules.mapNotNull { it.name.takeIf { n -> n.startsWith(begin) } }
                 }
                 .required()
                 .build()
diff --git a/src/main/resources/resources/liquidbounce/lang/zh_cn.json b/src/main/resources/resources/liquidbounce/lang/zh_cn.json
index 0c81b66dc42..54e5638c9a8 100644
--- a/src/main/resources/resources/liquidbounce/lang/zh_cn.json
+++ b/src/main/resources/resources/liquidbounce/lang/zh_cn.json
@@ -21,7 +21,7 @@
   "liquidbounce.command.binds.subcommand.list.result.bindings": "快捷键",
   "liquidbounce.command.binds.subcommand.list.result.noBindings": "未找到任何快捷键。",
   "liquidbounce.command.binds.subcommand.list.result.page": "页数: %s",
-  "liquidbounce.command.binds.subcommand.list.result.pageNumberTooLarge": "你输入的页数过大，一共有 %d 页。",
+  "liquidbounce.command.binds.subcommand.list.result.pageNumberTooLarge": "你输入的页数过大，一共有 %s 页。",
   "liquidbounce.command.binds.subcommand.remove.description": "移除快捷键。",
   "liquidbounce.command.binds.subcommand.remove.parameter.name.description": "模块名。",
   "liquidbounce.command.binds.subcommand.remove.result.bindRemoved": "已移除模块 \"%s\" 的快捷键。",