Better clean (20/25)

Better clean