Comment reorganization.