Clean up unnecessary quoting