Made suggestions from PR.