Changes according to PR comments.