Refactor player selection