More PEP8 style fixes