Cleanup; restructuring.