DRY rearrangements