Changes after comments on PR.