Remove redundant param
Improve Match spec