tidy up quote usages