More PEP 8 naming compliance