Better clean (19/25)

Better clean