Refactoring the Player object a bit.