A few readability improvements.