cleanup and method renaming