refactor oxorder
Refactoring
Merge branch 'feature/refactoring'