Forecast: cleaned up temp unit switching code