restructure things a bit