more cleaning on evaluation rules