Clean-up (wrap [string] values in single-quotes)