Restructure a bit.