Refactoring slightly
Removing visible scopes from enteprise distributors and producers