Rearranging and improving documentation