some basic reorg
more cleanup