improve structure more