More PEP8