clean up and quote additions