Add some suggestions for an improved structure.