A little more cleanup and more consistent quotes.