Using Headings and removing more repetition