refactor update_organization service