Better clean (13/25)

Better clean