small refactoring
unused LoC removed
equals method fixed