zhang-li comment cleanup