Better clean (5/25)

Better clean