clean up template syntax