HPCC-11033 Revise based on review comments

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