refactor usage of callee