Fix markup and rearrange sentences