Reworked Lump Cleanser code