The command line tools are growing into spaghetti code - they need to be refactored, and may be a good fit for [click](http://click.pocoo.org/3/).
