Refactor consent

Refactor based on what came up in our code review of exposing the data sharing status of a user.