more pep8 cleanup