typo
refactor: substitute need for random var id by using the object_id
heavy refactoring (poodr)