A few readability changes