Minor readability changes