issue #969 reorganize comments