HPCC-9936 Alterations from code review

NB: Not all of the suggested changes have been made at this point, pending
return comments.

Signed-off-by: jamienoss <james.noss@lexisnexis.com>