docstring and rearrangements (2)