acu114906 [rs-base] Iteration on code review