Minor restructuring.