PEP8 fixes again