More consistent use of quotation marks