Get rid of some extra whitespace in the template