Code reorg and comments.