Changed formatting. I think it is uglier, but it makes the structure more clear. So net win.