Working on cleaning up player classes