Simplify variables passed to template