cleaned up player class a bit