Minor changes to structure.