HPCC-9556 Various changes following comments from review

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>