structural and stylistic updates
updates