Clean up some code and make output more pep8y
Merge pull request #177 from Yelp/cleanup_code

Clean up some code and make output more pep8y