Fix quality flaw : factorize duplication