Restructure things a little