Improve matching loop readability