clean up some equal methods