Better clean (17/25)

Better clean