Refactor SelectNextPlayer a bit (+ minor style issues)