Some more pep8 cleanup.
Merge pull request #47 from rlr/more-cleanup

Some more pep8 cleanup.