Better HTML markup and use CommonMark