Cleaned-up CLI commands.
13 files changed