pep8 and imports cleanup