More method refactoring