Rename mach.router to mach.matcher
Style tweaks