Additional update based on review comments
Additional update based on review comments

Signed-off-by: Anthony Fishbeck <b39a79776dfc3dc7e50b9d96c0f34d4179c68144@lexisnexis.com>

afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform,afishbeck/HPCC-Platform