Forecast: Cleanups
More code cleanups
Add energy cooling factor using formula from the paper