Some cleanups to imports
pep8, irony
Merge pull request #890 from alex/import-cleanup

Some cleanups to imports