This is a bit of a mix of small refactor + small visual change. I can split those changes if preferred, but they're small enough on their own that I didn't want to overflow the MR queue 😄