Refactoring and Deleting Functions