More cleaner (24/34)

More cleaner