clean up double quote usage