Cleanup order and whitespace around filter_cluster_map