pep8 cleanup
Merge pull request #78 from chrumalo/fix/pep8

pep8 cleanup