Enhance default cleaners a bit
Version 1.2.2