Reformat the templates for pep-8

All good? Work for #69