Better clean (18/25)

Better clean