Reformat the template a bit