Refactor matching seed