Some cleaning in criterias