finished refactoring SchemaMatcher.java