PEP8 cleanups, unused imports cleanups