Make code PEP8 compliant