Cleaned up OrderInfo model