Added StyleCop and cleaned up Matcher classes