UC-99 code review changes