Cleaning up player entity and play classes a bit