some Pep8 cleanup before refactoring further