More PEP8 compliant code