Improve formatting of WCF.Template