Making changes for review comments.