manager refactoring