more complex pep8 cleanups
pep8