updateOrderRequest + cleaning up