Refactor cleaning notification