replcae RouteMatcher with simple Closure

Please merge, please.