Improve structure