minor rearrangements