reorg + cleanup