HotWater cleaned up