- Rearrange code