Charset fix.
Refactor.