PEP8 and remove unused imports