Fixed error message -- had variable that was undefined.
updated cleaners.