return template directly
code cleanup