Heap fixed
Code style