Rearrange code

Last modified: 20 June 2023