Gauge class cleaned up some