HPCC-12046 Clean up some items following code review

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