simplifying structure, updated shared components