Minor readability and cosmetic changes.