Refactoring and renaming methods.