renaming, IsEqualTo added, refactoring