Rework expr structure