More PEP 8