cleaned up formatting of templates/fixed typos