made the changes as per the review comments in PR