HPCC-11422 small changes from final code review.
Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>