Clean up of player class