Address comments from code owner.

Mostly to make it compliant to new requirement.
4 files changed