Forecast - small code cleanup