[IMP]Done the improvement as per the comments on PR.