Patch updated with code style fixes.

-- 

Prakhar Bahuguna