refactor/correction calls code