Refactoring reorderer.