Rearrange and comment sections