[MOD] Fixed PEP8 errors and more