Remove singleton .each on matcher
Remove duplicate constant
Fix namespace matcher API use