Change matcher to min/max (match style + cleaner function)