Made changes based on PR comments.