Take code cleanup improvement from PowerShell repo

[adityapatwardhan]

For details look at comment:
PowerShell/PowerShell#14090 (comment)

[issue-label-bot]

Issue-Label Bot is automatically applying the label feature_request to this issue, with a confidence of 0.84. Please mark this comment with 👍 or 👎 to give our bot feedback!

Links: app homepage, dashboard and code for this bot.

[xtqqczze]

@adityapatwardhan I can submit PRs here once PowerShell/PowerShell#14090 is merged.

[adityapatwardhan]

I would really appreciate it.

[xtqqczze]

@adityapatwardhan Please could you look at open PRs.

[adityapatwardhan]

Aall code cleanup changes have been merged.