More cleanup.  Fixed up the Template.