Removed 'echo' before template functions