HPCC-12513 Changes following code review

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