Clean up and pep8 as far as I can all the code here.
Merge pull request #7 from lowks/master

Clean up code with pep8.