Refactoring Initial Callee