Rearrange and some comments