HPCC-9507 Alterations after review

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