Made corrections as per feedback