Add closure.h.pump and adjust format