Comments and reorganization.