more pep8 cleanups