Refactor quotes
Fix quotes