More clean (1/28)

More clean