Remove matcher struct and interface type, just use Matcher as a function
Rename vars; Format