HPCC-12290 Clean up indentation and use SELF:: instead of this->

Various other bits of cleaning up as well

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>