pep8 fixes
cleaning unused imports breaking tests