REFACTOR hulaki comet listner and listener manager