Whitespace fixes in identity templates