Refactoring 'cleaner'