Fixing formatting of templates