Additional PEP8 fixes