Refactor to pep8
Merge pull request #7 from Yelp/Pep8_Refactor

Refactor to pep8