Does the sentence 1 look good? 2. Perfect sentence structure sometimes does not work so I’d use the same.

For the second one, maybe you can ask ” whom our data will be disclosed to? If I want to learn another language, I think it’s “I think it’s who because you ask was not the subject(doer). I mean, “I think it was whom” I think it’s who also. I think that’d be more formal but nowadays, even the natives are leaving using “whom” so it is your call.