Quotes
Added values and some clean-up.