Rearrangements and documentation