Cleanup pep8 refactoring

Removed unused imports
applied most pep8 styles