Comment by layer8

To be fair, you didn’t specify that the functional requirements should be maintained, you only asked for better code. ;)