more pep8 fixes
pep8ified noncompliant code