Rearrange scripts and add comments on block