Improve PEP8 compliance.
Merge pull request #126 from chrishaines/pep8

Improve PEP8 compliance.