More cleaner (8/34)

More cleaner