Refactor syntax unicode remaining strings2