Fix some formatting for PEP8
Merge pull request #4707 from basepi/pep8

Fix some formatting for PEP8