GUAC-607 Responded to code review comments.