[FIX] PEP8 errors and cleanup