Restructure a tad