UC-90 Updates in response to code review