UC-96 Response to code review