Better clean (15/25)

Better clean