Refactor fiboheaps