Making templates readable: Indentation and newlines

 Adding \n and '  ' indentation where appropriate.