Fixed accidental re-format & added newlines to template files