HPCC-3060 Fix formatting and other minor issues

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