better comparision cleanup