Neaten up some templates etc.