Some suggestions for readability

Hey @lissyx - I was hoping you'd read over these changes and agree that this makes this pull much more readable.

Would you please take this commit and merge it into your pull #10396 before we land it?