- Some readability changes