Improve Quotes