Clean up code for pep8 compliance.
Merge pull request #35 from dmend/master

Clean up for pep8 compliance