Heap Added & some cleaning