refactoring SchemaMatcher.java