more cleaning, more modular