and utility class for equals, updated some equals methods to use it