PEP8-ification