Conform to stricter rules in newer pep8.
Merge pull request #450 from rhattersley/fix-pep8

Conform to stricter rules in newer pep8.