Cleaner more clean (40/42)

Cleaner more clean