HPCC-8817 Revise based on review comments

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