I find some code to refine using analysis.

Comment From: zhangt2333

@harawata Thanks for your code review. Your suggestion is great.

Comment From: harawata

Thank you, @zhangt2333 !