That does seem easier to read IMO. I'll invert and merge it.