Rearrange and add a comment