Better quoting