Reorganize comments