More readability tweaks