is the goal of that refactor to help with the engine somehow?