adding .Not() qualifier / some refactoring