just some cosmetic changes now, Vadim already fixed the heap_xxx calls.
Attach a file by drag & drop or click to upload
