Add quotes around variable substitutions
Fix spacing