Simplify cleaning and small fix.