refactor manage