Tidy up a few templates