Made changes as per CR comments