yesterday winner refactoring