Responsibility refactoring