More cleaner (23/34)

More cleaner