Readability tweaks