Fix quoting

Fixes possible errors when dealing with white space. Also removes unneeded double quotes.