Cleanup CLI
Merge pull request #494 from kevva/cleanup-cli

Cleanup CLI