Some more style fixes

Jatin, 

Please review this branch and merge it. Mostly it contains the style fixes.