Whitespace and quote changes