Revert "[Rupesh] - Style changes after discussing with Anan"

This reverts commit ac7cb1f2ed20de9ffb057d144268f0a1ea78d131.