cleanup pep8 and such