minor rearrangement