Cleaned up the player class