Refactor text and html into generic content type