PEP8-ification, updated templates.