HPCC-12167 Clean code based on review

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