Refactor syntax unicode

Modifications after Mark's feedback no 4