Refactor user_organization policy
Fix PR comments