Refactor order