minor restructuring.