Address more #51528 feedback & do some clean up#51767

Merged

layomia merged 1 commit intodotnet:mainfrom layomia:CleanUp

Apr 26, 2021

+170-238

Commits on Apr 23, 2021

Address more dotnet#51528 feedback & do some clean up
layomia
committed