Replace == operator and other minor fixes

* replaced == operator with equality operator;
* other minor fixes.