- some code cleanup in the command line tool