ClusterMatcher.java: cleanup; add javadoc; change signature of observer interface