Remove further pep8 violations
Merge branch 'lowks-pep8'