Erase duplicate code + strict comparaison