Avoid double quotes where not necessary