Consolidate some logic within winner picking