Rearraged Code, updated Player Class