HG-332 Address some code review comments