cleanup pep8 and imports