check criteria argument + code cleaning