Rearrange initialization