Tidy up the code

Currently, the code is very messy (pieces of code everywhere). It needs to be tidied up. Copilot can help, but be careful not to change anything in the code. It should remain the same but reordered.