Improve template text a bit