Refactor

- Fix unicode issue