[Rupesh] - Style changes after discussing with Anan