Clean matcher mode: parametrized functions instead of duplicated functions