UC-54 Updates to comments/docs as per code review