Implementation of comments on review