Update arith with code review changes