Adding better structure