misc reorg & cleanup