Rename TreeMapper to Matcher
Reformat some code