Order refactoring