[tidy] cleaninig the way that the heap is defined and used

* required to eliminate the void* from the heap definition