More cleaner (28/34)

More cleaner