Refactoring State-related code in Player
And proper naming of State classes