Rearrange and add comment