[REFACTORING] 'Cleanup'