remove redundant reference to cluster, create wrapper macros