refactoring
fixed quoting when String starts with " "