cleanup template syntax