removed the white space killing in templates