Add snippet to check for inconsistency in cluster data structures
Update TODO