PEP8, cleaned imports