Minor style changes and fixes