import and pep8 cleanup