Better winner() refactor