tried to refactor some stuff with box2d usage