HPCC-11031 Edits based upon code review

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>