slight manager refactoring