Rearrange code

Last modified: 29 November 2022