cleaned up player class, made it more generalized