Refactor current player switching