CellHeap_2: Cosmetic changes