code cleaning : replace == and !=