A little reorg and comments