Quotes cleanup