#17 improve gsub usage, fix double quotes