Utf refactor