HG-251 Code review feedback