refactor CallStack