Rearrange code

Last modified: 04 November 2024