Incorporate minor pull request comments from Chen.
Incorporate minor pull request comments from Chen.

SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn,SRCH2/srch2-ngn