commenting scanner reorg