HPCC-10294 Fix comments following code review and other clean up.

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