refactoring of method names, dependency responsibilities