Class cleanup and addition of StatHat collection points