cleanup + added player class