Some readability improvements