Rename variables
Move player to external class