Wsas 1727

Formatting issues. Please fix the same in all the places in this PR.