HPCC-8845 Changes based on code review

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>