Making PEP8 compliant