Changed cleaner from ref to pointer member