Clean up wording of titles and rearrange sections appropriately