Refactor to order creation