Some readability improvements.