reorg
moar cleanup