[FIX] still some PEP8 issues