double quotes clean up improvements