More PEP8 Compliant