updating structure, simplifying