Better clean (22/25)

Better clean