Refactoring
Refactoring
Encoding fix