Weather: Clean up getHeat/getHumidity somewhat