Improve structure.