More PEP 8 changes