Checking if I can modify the code a bit more to collapse things