More PEP8 compliant