Cleaner more clean (8/42)

Cleaner more clean