move expressions transformation into a proper class