pep8 + imports cleanup