Fixing more PEP8 errors