Minor refactor on player select