Code clean-up and refactoring in CLI helpers
Merge pull request #11 from arax/beta2_fixes

Code clean-up and refactoring in CLI helpers