Fixing some of the formatting issues
Formatting path
Merge pull request #15237 from nmadhok/fix-formatting

Fixing some of the formatting issues