Cleanup imports
Fix some PEP-8 warnings