UC-93 responding to code review feedback