HG-332 Code review feedback
HG-332 More code review changes