quote refactored