cleaned up heater