UC-99 Code review changes