More consistent use of double / single quotes