Refactoring content type