More PEP8 work