[FIX] Still some PEP8 erros