comment fixes
optimization for equals method