Re-factor matchable to reduce complexity