Fixing issues pointed by the review.