CLN: Minor cleanup - unused imports, pep8