More PEP-8 updates