pep8 cleanup, merge now