refactored quotes