HPCC-12602 Code review changes

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>