peer review changes and removal of redundent templates