Fix more PEP8 errors