Making structure more correct