Better clean (16/25)

Better clean