Make a better structure