Change to use replace-regexp-in-string