Simplify matching