Refactoring CurrentPlayer and Session