Some reorganizing of paragraphs