Similar refactoring to Quotes

Similar refactoring to Quotes