Hongyi: fix code review comment, ready for next code review