more quoting style changes