Refactor syntax unicode