HPCC-10103 - Refactoring based on code review

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