Minor style changes/fixes