Made some correction according to the review