More consistent use of ' instead of "