Simplify some of the templates