A few other tweaks to readability