More PEP-8