Some readability tweaks.