Fixing commenting and style
Fixed all the formatting
Merge conflicts resolved.