More cleaning up of template.