More pep8
Merge pull request #2 from skuom/patch-1

More pep8