Addressed additional PR comments.