Better clean (3/25)

Better clean