GaugeView Code Cleanup