Better way to match