Refactor <order>