Reorganize comments.