PEP8'ify code