cleaned up player class