pep8 and utility cleanup
Merge pull request #17 from WyseNynja/master

pep8