Managers refactoring