Removed extraneous whitespace from templates