refactoring content manager