another small rearrangements