Better clean (23/25)

Better clean