Simplify the CLI source code