INT-3352 Polishing - PR Comments

- PR Comments
- Improve equals()