Adapt to code review 01

Adapt to code review.
Please read the commit message that I chaneged.

Sorry for being late.