Restructure a little bit