Minor edit on templates