FIX: PEP8 Errors and unused imports