Some minor rearrangements