Some pep8 adjustments
Merge pull request #3 from holm/master

pep8