cleaned up indenting, made NO MATCH criteria more readable