Minor rearrange