refactored code to make by_winter VS by_year more consistent