great code refactoring

removed trash. added == and != relations.
.