Reorderable refactor