Refactoring with responder