PEP8 clean-up and until refactor to isolate multi-imports.