Few tweaks, based on the comments from the review.