use org ID instead of org name, and clean up logging statements