Some reorg + some comments