Refactoring order