More PEP8 changes