Code reorg + cleanup