refactor params matcher step