<order> refactoring (partial)