ThermoStat cleaned up