refactor oxorder