tweaking storm cleanup