Go fmt clean up
Removed the tmpl naming convension.