Consistency and formatting across template files.
Merge pull request #2269 from bakercp/bugfix-template-formatting-clean

Consistency and formatting across template files.