Formatting updates to template files