Tidy up the structure.