A little bit of PEP8 and other cleanup
Merge pull request #15 from olafleur/master

A little bit of PEP8 and other cleanup