Refactor user profile