refactored the cli class
Merge pull request #5 from Ball/cli-refactor

refactored the cli class