Method refactoring