Readability tweaks

I'm pedantic as heck, apparently.