Some refactoring to player class.