Indentation and other minor updates to the template.