Make code PEP8 compatible