improve clean option