HPCC-11637 Revise based on review comments

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