Pep8 fixes + remove bogus imports