Refactoring FR->EN