Comments and reorg