misc. reorg/cleanup