PEP8 style fixes
Merge branch 'pep8'