HG-109 Address code review