Improve structure's semantic