rework the quote stripping