small reorg, comments