improve clean
v0.2b2