Removed Spaces from templates