Improve structure and descriptions