UC-136 code cleanup in response to code review