Rearrange & cleaning