Refactor + traduction