Minor style changes and formatting.