slight rearrangements