Refactoring WasteHandler.