Refactoring 'cleaner'
Refactoring 'cleaner'