I find this to be more readable. And since it doesn't take much space, I thought, why not.

I'll fix line 19 and the other ones, which are too long. Didn't catch that.