fix: make cleanup passed into watch callback bound

fix: make cleanup passed into watch callback bound #87