Refactor code + recherche