Refactoring code, change the code to english