HPCC-9682 Revise code based on review

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>