More cleaner (20/34)

More cleaner