Cleaned up some responder methods.