Made changes as per cr comments