Reformat, no functinal change
Bugfix UTF-8