More clean (8/28)

More clean