moving def to defn and adding cleaning utility