Minor rearrangement