diff --git a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/BaseCliktCommand.kt b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/BaseCliktCommand.kt
index 3fd171c8..54586110 100644
--- a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/BaseCliktCommand.kt
+++ b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/BaseCliktCommand.kt
@@ -97,7 +97,6 @@ abstract class BaseCliktCommand<T : BaseCliktCommand<T>>(
      */
     open val hiddenFromHelp: Boolean = false
 
-    // TODO: make these all private?
     internal var _subcommands: List<T> = emptyList()
     internal val _options: MutableList<Option> = mutableListOf()
     internal val _arguments: MutableList<Argument> = mutableListOf()
@@ -265,7 +264,6 @@ abstract class BaseCliktCommand<T : BaseCliktCommand<T>>(
         _groups += group
     }
 
-    // TODO: all of these final functions could be extensions?
     /**
      * Return the help string for this command, optionally with an [error].
      *
diff --git a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parsers/CommandLineParser.kt b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parsers/CommandLineParser.kt
index 930b7f84..3e654ab9 100644
--- a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parsers/CommandLineParser.kt
+++ b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parsers/CommandLineParser.kt
@@ -8,11 +8,24 @@ import com.github.ajalt.clikt.output.defaultLocalization
 
 // TODO: docs, changelog
 object CommandLineParser {
+    /**
+     * Split a command line into a list of argv tokens.
+     *
+     * ### Example
+     * ```
+     * tokenize("--text 'hello world'") == listOf("--text", "hello world")
+     * ```
+     *
+     * @param commandLine The command line to split
+     * @param filename The name of the file being parsed. This is used in error messages.
+     * @param localization The localization to use for error messages
+     */
     fun tokenize(
         commandLine: String,
+        filename: String = "",
         localization: Localization = defaultLocalization,
     ): List<String> {
-        return shlex("TODO", commandLine, localization)// TODO shlex
+        return shlex(filename, commandLine, localization)
     }
 
     inline fun <T : BaseCliktCommand<T>> main(