Fixing comments from review