import and pep8 changes