Refactor the responder out as a helper. Other factorings.