Minor comments/changes based on the review