Cleaned up and simplified ClusterSeparator