more minor restructuring