refactoring n°2