- improve structure