Refactoring including comments on methods