Content refactoring