made more minor restructuring changes