Cosmetics

Mostly introduction of .equals./.notequals. operators