More cleaning of compare