Simplified MatchFilter, fixed typing errors.