Addressed PR review issues.