[TASK] organize variables to update template