Better clean (21/25)

Better clean