HG-191 Code review feedback