Content refactor