CLI simplification
Merge pull request #21 from pote/code_cleanup

CLI simplification