more refacto of game objects