Starting the refactoring of function and method calls