Refactor syntax unicode mac