Refactor user privacy