More cleaner (12/34)

More cleaner