Some refactoring in Player class