Style changes...
Merging with Latest Changes from Abhishek.