Rearrange and documentation.