Refactor comments & code arrangement
Fix typo
Change Matcher interface to be easier