PEP8: refactoring, remove unneded imports
PEP8: enforce.