code cleanup and moved class functions to own file
Merge branch 'master' of github.com:markwc/command-line