Cleaning up the CLI client codebase