General readability improvements