More EE refactor