Proper quote handling