Cleanup using struct