Fixed If-operator

...and some useless comments deleted