Fix encoding
Just refactoring