More PEP 8 corrections