Restructure a bit more