cleaned up ResponseHandler