More PEP8 fixes