Refactor order_book