Refactoring ContentList