a round of clean-up on the templates
minor reformatting