Code refine. (#2227)

2 files changed