refactored EquivalenceClass, removed static calls