cleaned up cluster view