Some readability tweaks